summaryrefslogtreecommitdiff
path: root/t/t6050-replace.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-03 22:23:13 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-03 22:23:13 -0700
commitf92d62ec4ead67109418483b65aaf158b7462121 (patch)
tree41c8b17b55ec094911c29c78a1067ba6e629daf7 /t/t6050-replace.sh
parentcd1547d2049f32a5c13ba1828fcd1a553b844e97 (diff)
parent2e3400c0521e4997601916790b8b2a9ff588c6f3 (diff)
downloadgit-f92d62ec4ead67109418483b65aaf158b7462121.tar.gz
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-xt/t6050-replace.sh2
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)" &&