diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-03-24 08:44:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-27 17:45:47 +0200 |
| commit | 0e496492d26a8f7f360b6fad1aed2cae74403fa1 (patch) | |
| tree | 8e46a524080c7a49b19b603932d1a3f833ad08e2 /t/t3510-cherry-pick-sequence.sh | |
| parent | t/helper: add an empty test-tool program (diff) | |
| download | git-0e496492d26a8f7f360b6fad1aed2cae74403fa1.tar.xz git-0e496492d26a8f7f360b6fad1aed2cae74403fa1.zip | |
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-x | t/t3510-cherry-pick-sequence.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 ' |