diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-03 22:23:13 -0700 |
commit | f92d62ec4ead67109418483b65aaf158b7462121 (patch) | |
tree | 41c8b17b55ec094911c29c78a1067ba6e629daf7 /object.c | |
parent | cd1547d2049f32a5c13ba1828fcd1a553b844e97 (diff) | |
parent | 2e3400c0521e4997601916790b8b2a9ff588c6f3 (diff) | |
download | git-f92d62ec4ead67109418483b65aaf158b7462121.tar.gz git-f92d62ec4ead67109418483b65aaf158b7462121.tar.xz |
Merge branch 'nd/maint-fix-replace'
* nd/maint-fix-replace:
parse_object: pass on the original sha1, not the replaced one
Diffstat (limited to 'object.c')
-rw-r--r-- | object.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -199,7 +199,7 @@ struct object *parse_object(const unsigned char *sha1) return NULL; } - obj = parse_object_buffer(repl, type, size, buffer, &eaten); + obj = parse_object_buffer(sha1, type, size, buffer, &eaten); if (!eaten) free(buffer); return obj; |