diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:46 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 20:52:46 (GMT) |
commit | c9208597a986509e6ce9b3c7936fd7a2b3bb3e43 (patch) | |
tree | b0be7ecbb4410cc0243d5423427928fb248111e8 /t | |
parent | 36fd304d819d412adf1ed81d6a983dabb28bfc9b (diff) | |
parent | 2d05ef2778b99e05e6a8a40c5b8d59a3c4ab1274 (diff) | |
download | git-c9208597a986509e6ce9b3c7936fd7a2b3bb3e43.zip git-c9208597a986509e6ce9b3c7936fd7a2b3bb3e43.tar.gz git-c9208597a986509e6ce9b3c7936fd7a2b3bb3e43.tar.bz2 |
Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'
The sequencer machinery compared the HEAD and the state it is
attempting to commit to decide if the result would be a no-op
commit, even when amending a commit, which was incorrect, and
has been corrected.
* pw/sequencer-compare-with-right-parent-to-check-empty-commits:
sequencer: fix empty commit check when amending
Diffstat (limited to 't')
-rwxr-xr-x | t/t3403-rebase-skip.sh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh index 1f5122b..ee8a8db 100755 --- a/t/t3403-rebase-skip.sh +++ b/t/t3403-rebase-skip.sh @@ -7,6 +7,8 @@ test_description='git rebase --merge --skip tests' . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-rebase.sh + # we assume the default git am -3 --skip strategy is tested independently # and always works :) @@ -20,6 +22,13 @@ test_expect_success setup ' git commit -a -m "hello world" && echo goodbye >> hello && git commit -a -m "goodbye" && + git tag goodbye && + + git checkout --detach && + git checkout HEAD^ . && + test_tick && + git commit -m reverted-goodbye && + git tag reverted-goodbye && git checkout -f skip-reference && echo moo > hello && @@ -76,4 +85,27 @@ test_expect_success 'moved back to branch correctly' ' test_debug 'gitk --all & sleep 1' +test_expect_success 'fixup that empties commit fails' ' + test_when_finished "git rebase --abort" && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 fixup 2" git rebase -i \ + goodbye^ reverted-goodbye + ) +' + +test_expect_success 'squash that empties commit fails' ' + test_when_finished "git rebase --abort" && + ( + set_fake_editor && + test_must_fail env FAKE_LINES="1 squash 2" git rebase -i \ + goodbye^ reverted-goodbye + ) +' + +# Must be the last test in this file +test_expect_success '$EDITOR and friends are unchanged' ' + test_editor_unchanged +' + test_done |