development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nd/maint-fix-replace'

Browse source 
* 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
parent cd1547d204 2e3400c052
commit f92d62ec4e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
object.c
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;

2
t/t6050-replace.sh
View file

@ -209,7 +209,7 @@ test_expect_success 'fetch branch with replacement' '
test_expect_success 'bisect and replacements' '
git bisect start $HASH7 $HASH1 &&
test "$S" = "$(git rev-parse --verify HEAD)" &&
test "$PARA3" = "$(git rev-parse --verify HEAD)" &&
git bisect reset &&
GIT_NO_REPLACE_OBJECTS=1 git bisect start $HASH7 $HASH1 &&
test "$HASH4" = "$(git rev-parse --verify HEAD)" &&