| commit | 5d0b5840c7a794422fa24b014a6cf0b7e7ac9281 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 May 2011 00:20:10 +0000 (16 17:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 May 2011 00:20:10 +0000 (16 17:20 -0700) | ||
| tree | d8fb6bf5b8b9d10adc99cd9639a1ea559aadcce5 | treesnapshot (tar.gz zip) |
| parent | 33e6c11c91f4b43768f85f5280a968cb33b72c0a | commitdiff |
| parent | 5bf29b950063c8fa2f3666cb6cf2ca20be61f3d1 | commitdiff |
Merge branch 'jc/replacing' into next
* 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
* 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 | diff1 | diff2 | blobhistory |
| commit.h | diff1 | diff2 | blobhistory |
| environment.c | diff1 | diff2 | blobhistory |
| sha1_file.c | diff1 | diff2 | blobhistory |