Merge branch 'nd/maint-fix-replace'

* nd/maint-fix-replace:
  parse_object: pass on the original sha1, not the replaced one
This commit is contained in:
Junio C Hamano
2010-09-03 22:23:13 -07:00
2 changed files with 2 additions and 2 deletions

View File

@ -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;