Andrew's git / gitweb.git / diff
?
Merge branch 'nd/maint-fix-replace'
authorJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 05:23:13 +0000 (22:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 4 Sep 2010 05:23:13 +0000 (22:23 -0700)
* nd/maint-fix-replace:
parse_object: pass on the original sha1, not the replaced one

1  2 
object.c patch | diff1 | diff2 | blob | history
t/t6050-replace.sh patch | diff1 | diff2 | blob | history
diff --cc object.c
Simple merge
diff --cc t/t6050-replace.sh
Simple merge