X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=t%2Ft3510-cherry-pick-sequence.sh;h=9f93445f1e496b930f4f7cb53146344315bc1c8e;hb=0e496492d26a8f7f360b6fad1aed2cae74403fa1;hp=0acf4b14614c750d3c2324d8a941aa77d5c7ad56;hpb=efd71f8913a876a0c333fa29382530d6abbc6164;p=thirdparty%2Fgit.git diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 0acf4b1461..9f93445f1e 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -247,9 +247,9 @@ test_expect_success '--abort after last commit in sequence' ' test_expect_success 'cherry-pick does not implicitly stomp an existing operation' ' pristine_detach initial && test_expect_code 1 git cherry-pick base..anotherpick && - test-chmtime -v +0 .git/sequencer >expect && + test-tool chmtime -v +0 .git/sequencer >expect && test_expect_code 128 git cherry-pick unrelatedpick && - test-chmtime -v +0 .git/sequencer >actual && + test-tool chmtime -v +0 .git/sequencer >actual && test_cmp expect actual '