b82b6a2992
test: add integration test to verify the interactive rebase correctly work
2023-04-15 17:26:08 +10:00
860a8d102b
Add integration test for dropping a todo commit when there's an update-ref
...
The test shows how we are accidentally dropping the wrong commit in this case.
We'll fix that in the next commit.
2023-04-15 08:36:03 +02:00
6a340ec840
Reorder tests
2023-04-13 19:17:08 +02:00
2b4ac986a2
Don't add custom command to history if it starts with space
...
Add tests for custom command with leading space
2023-04-13 21:20:46 +10:00
d508badd62
Better error message when trying to amend a commit other than head during rebase
2023-04-01 08:16:15 +02:00
e7d0116312
Allow amending the head commit during interactive rebase
2023-04-01 08:16:15 +02:00
7513d77567
Add integration test for amending from the files panel
2023-04-01 08:16:15 +02:00
c757063264
Better error message when trying to edit or move a non-todo commit during rebase
...
Previously we would have tried to do the rebase, resulting in a long and
somewhat cryptic error message from git; now we check ourselves and show a less
intimidating message.
2023-04-01 08:16:15 +02:00
b24955063c
Allow rewording the head commit during interactive rebase
2023-04-01 08:16:15 +02:00
4b4dccfd7d
Fix "move patch into new commit" for partial hunk ( #2507 )
2023-03-18 18:17:47 +11:00
4ca012dbfb
Add test for reverse-applying a patch that conflicts
...
The patch contains changes to two files; the first one conflicts, the second
doesn't. Note how it only applies changes to the first file at this point in the
branch; we'll fix this in the next commit.
This test would fail on master for multiple reasons.
2023-03-07 09:49:34 +01:00
f7e8b2dd71
cleanup integration test code
2023-02-26 12:54:13 +11:00
