summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-04 05:23:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-09-04 05:23:13 (GMT)
commitf92d62ec4ead67109418483b65aaf158b7462121 (patch)
tree41c8b17b55ec094911c29c78a1067ba6e629daf7 /object.c
parentcd1547d2049f32a5c13ba1828fcd1a553b844e97 (diff)
parent2e3400c0521e4997601916790b8b2a9ff588c6f3 (diff)
downloadgit-f92d62ec4ead67109418483b65aaf158b7462121.zip
git-f92d62ec4ead67109418483b65aaf158b7462121.tar.gz
git-f92d62ec4ead67109418483b65aaf158b7462121.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/object.c b/object.c
index 277b3dd..7adfda7 100644
--- a/object.c
+++ b/object.c
@@ -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;