![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:37:21 +0000 (20:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 May 2011 03:37:21 +0000 (20:37 -0700) | ||
| commit | 61d7503da141f13bc916b36012760791761cc909 | |
| tree | 2b1cff95e16f2ed1543e4790d682e2e4996e92b7 | tree | snapshot |
| parent | 2d220862d43b4d54f3173f67956fc5221690fb7e | commit | diff |
| parent | 5bf29b950063c8fa2f3666cb6cf2ca20be61f3d1 | commit | diff |
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
* 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 | | blob | history |
| commit.h | diff1 | | diff2 | | blob | history |
| environment.c | diff1 | | diff2 | | blob | history |
| sha1_file.c | diff1 | | diff2 | | blob | history |