diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 07:29:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 07:29:00 +0300 |
| commit | deb9845a0a180d27caf581da2bc0c46f5288db6f (patch) | |
| tree | ef66e687a0d6ef6b571c875247cc003fedd600d2 /t/t3510-cherry-pick-sequence.sh | |
| parent | 3d5a179ec01fa179a1f142c803a12d60062e9839 (diff) | |
| parent | decf711fc13858087c87808e539d75f06bd9f7b7 (diff) | |
Merge branch 'ps/test-chmtime-get'
Test cleanup.
* ps/test-chmtime-get:
t/helper: 'test-chmtime (--get|-g)' to print only the mtime
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 9f93445f1e..21b4f194a2 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-tool chmtime -v +0 .git/sequencer >expect && + test-tool chmtime --get .git/sequencer >expect && test_expect_code 128 git cherry-pick unrelatedpick && - test-tool chmtime -v +0 .git/sequencer >actual && + test-tool chmtime --get .git/sequencer >actual && test_cmp expect actual ' |