Merge branch 'jc/replacing'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:21 +0000 (20:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:21 +0000 (20:37 -0700)
commit61d7503da141f13bc916b36012760791761cc909
tree2b1cff95e16f2ed1543e4790d682e2e4996e92b7
parent2d220862d43b4d54f3173f67956fc5221690fb7e
parent5bf29b950063c8fa2f3666cb6cf2ca20be61f3d1
Merge branch 'jc/replacing'

* jc/replacing:
  read_sha1_file(): allow selective bypassing of replacement mechanism
  inline lookup_replace_object() calls
  read_sha1_file(): get rid of read_sha1_file_repl() madness
  t6050: make sure we test not just commit replacement
  Declare lookup_replace_object() in cache.h, not in commit.h

Conflicts:
environment.c
cache.h
commit.h
environment.c
sha1_file.c