diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-06 23:09:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-06 23:09:22 (GMT) |
| commit | f233c9f4550a831a69892e0a38db2a7654beb995 (patch) | |
| tree | ac12d3bd63de58f9b128729192aed904caa6b4f3 /t | |
| parent | ef3ce7c4b9f5ed7a13a0efcc576df855c4fd3d0f (diff) | |
| parent | befd4f6a81d382cc2b34186b619f734fa5f8070f (diff) | |
| download | git-f233c9f4550a831a69892e0a38db2a7654beb995.zip git-f233c9f4550a831a69892e0a38db2a7654beb995.tar.gz git-f233c9f4550a831a69892e0a38db2a7654beb995.tar.bz2 | |
Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
While running "revert" or "cherry-pick --edit" for multiple
commits, a recent regression incorrectly detected "nothing to
commit, working tree clean", instead of replaying the commits,
which has been corrected.
* sg/assume-no-todo-update-in-cherry-pick:
sequencer: don't re-read todo for revert and cherry-pick
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3429-rebase-edit-todo.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t3429-rebase-edit-todo.sh b/t/t3429-rebase-edit-todo.sh index aaeac6e..7024d49 100755 --- a/t/t3429-rebase-edit-todo.sh +++ b/t/t3429-rebase-edit-todo.sh @@ -52,4 +52,34 @@ test_expect_success 'todo is re-read after reword and squash' ' test_cmp expected actual ' +test_expect_success 're-reading todo doesnt interfere with revert --edit' ' + git reset --hard third && + + git revert --edit third second && + + cat >expect <<-\EOF && + Revert "second" + Revert "third" + third + second + first + EOF + git log --format="%s" >actual && + test_cmp expect actual +' + +test_expect_success 're-reading todo doesnt interfere with cherry-pick --edit' ' + git reset --hard first && + + git cherry-pick --edit second third && + + cat >expect <<-\EOF && + third + second + first + EOF + git log --format="%s" >actual && + test_cmp expect actual +' + test_done |