diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-04 07:23:13 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-04 07:23:13 +0200 |
| commit | f92d62ec4ead67109418483b65aaf158b7462121 (patch) | |
| tree | 41c8b17b55ec094911c29c78a1067ba6e629daf7 /t/t6050-replace.sh | |
| parent | Merge branch 'ab/compat-regex' (diff) | |
| parent | parse_object: pass on the original sha1, not the replaced one (diff) | |
| download | git-f92d62ec4ead67109418483b65aaf158b7462121.tar.xz git-f92d62ec4ead67109418483b65aaf158b7462121.zip | |
Merge branch 'nd/maint-fix-replace'
* nd/maint-fix-replace:
parse_object: pass on the original sha1, not the replaced one
Diffstat (limited to 't/t6050-replace.sh')
| -rwxr-xr-x | t/t6050-replace.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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)" && |