X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft6101-rev-parse-parents.sh;h=7d354a1fae774ca0e77e554dad827f1a9b781818;hb=efca578eec57869994da0982e05dcf1dee0bc213;hp=4f57a28f696ba2f6a803d33823babdcd921c5752;hpb=2b64f88f09ae2169ec85652b46897574e352936d;p=git.git diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh old mode 100644 new mode 100755 index 4f57a28f..7d354a1f --- a/t/t6101-rev-parse-parents.sh +++ b/t/t6101-rev-parse-parents.sh @@ -9,7 +9,7 @@ test_description='Test git-rev-parse with different parent options' . ../t6000lib.sh # t6xxx specific functions date >path0 -git-update-cache --add path0 +git-update-index --add path0 save_tag tree git-write-tree hide_error save_tag start unique_commit "start" tree save_tag second unique_commit "second" tree -p start @@ -19,13 +19,13 @@ save_tag final unique_commit "final" tree -p two_parents test_expect_success 'start is valid' 'git-rev-parse start | grep "^[0-9a-f]\{40\}$"' test_expect_success 'start^0' "test $(cat .git/refs/tags/start) = $(git-rev-parse start^0)" -test_expect_success 'start^1 not valid' "test $(git-rev-parse start^1) = start^1" +test_expect_success 'start^1 not valid' "if git-rev-parse --verify start^1; then false; else :; fi" test_expect_success 'second^1 = second^' "test $(git-rev-parse second^1) = $(git-rev-parse second^)" test_expect_success 'final^1^1^1' "test $(git-rev-parse start) = $(git-rev-parse final^1^1^1)" test_expect_success 'final^1^1^1 = final^^^' "test $(git-rev-parse final^1^1^1) = $(git-rev-parse final^^^)" test_expect_success 'final^1^2' "test $(git-rev-parse start2) = $(git-rev-parse final^1^2)" test_expect_success 'final^1^2 != final^1^1' "test $(git-rev-parse final^1^2) != $(git-rev-parse final^1^1)" -test_expect_success 'final^1^3 not valid' "test $(git-rev-parse final^1^3) = final^1^3" +test_expect_success 'final^1^3 not valid' "if git-rev-parse --verify final^1^3; then false; else :; fi" test_expect_failure '--verify start2^1' 'git-rev-parse --verify start2^1' test_expect_success '--verify start2^0' 'git-rev-parse --verify start2^0'