Merge git://git.bogomips.org/git-svn

diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 4556cdd8d2ac5d0b5c0e49d232de9923695ee540..1315bab595c03f16b89060434588b505faf1c46b 100755 (executable)
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -563,8 +563,8 @@ test_expect_success 'skipping away from skipped commit' '
        hash7=$(git rev-parse --verify HEAD) &&
        test "$hash7" = "$HASH7" &&
         git bisect skip &&
-       hash3=$(git rev-parse --verify HEAD) &&
-       test "$hash3" = "$HASH3"
+       para3=$(git rev-parse --verify HEAD) &&
+       test "$para3" = "$PARA_HASH3"
 '
 
 #