| commit | f92d62ec4ead67109418483b65aaf158b7462121 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 4 Sep 2010 05:23:13 +0000 (3 22:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 4 Sep 2010 05:23:13 +0000 (3 22:23 -0700) | ||
| tree | 41c8b17b55ec094911c29c78a1067ba6e629daf7 | treesnapshot (tar.gz zip) |
| parent | cd1547d2049f32a5c13ba1828fcd1a553b844e97 | commitdiff |
| parent | 2e3400c0521e4997601916790b8b2a9ff588c6f3 | commitdiff |
Merge branch 'nd/maint-fix-replace'
* nd/maint-fix-replace:
parse_object: pass on the original sha1, not the replaced one
* nd/maint-fix-replace:
parse_object: pass on the original sha1, not the replaced one
| object.c | diff1 | diff2 | blobhistory |
| t/t6050-replace.sh | diff1 | diff2 | blobhistory |