diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-04 09:23:13 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-04 09:23:13 +0400 |
| commit | f92d62ec4ead67109418483b65aaf158b7462121 (patch) | |
| tree | 41c8b17b55ec094911c29c78a1067ba6e629daf7 | |
| parent | cd1547d2049f32a5c13ba1828fcd1a553b844e97 (diff) | |
| parent | 2e3400c0521e4997601916790b8b2a9ff588c6f3 (diff) | |
Merge branch 'nd/maint-fix-replace'
* nd/maint-fix-replace:
parse_object: pass on the original sha1, not the replaced one
| -rw-r--r-- | object.c | 2 | ||||
| -rwxr-xr-x | t/t6050-replace.sh | 2 |
2 files changed, 2 insertions, 2 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; diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index 4185b7ca1d..dd917d76da 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -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)" && |