summaryrefslogtreecommitdiff
path: root/t/t3510-cherry-pick-sequence.sh
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-03-24 07:44:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-27 15:45:47 (GMT)
commit0e496492d26a8f7f360b6fad1aed2cae74403fa1 (patch)
tree8e46a524080c7a49b19b603932d1a3f833ad08e2 /t/t3510-cherry-pick-sequence.sh
parentefd71f8913a876a0c333fa29382530d6abbc6164 (diff)
downloadgit-0e496492d26a8f7f360b6fad1aed2cae74403fa1.zip
git-0e496492d26a8f7f360b6fad1aed2cae74403fa1.tar.gz
git-0e496492d26a8f7f360b6fad1aed2cae74403fa1.tar.bz2
t/helper: merge test-chmtime into test-tool
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3510-cherry-pick-sequence.sh')
-rwxr-xr-xt/t3510-cherry-pick-sequence.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 0acf4b1..9f93445 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
'