1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00

462 Commits

Author SHA1 Message Date
b82b6a2992 test: add integration test to verify the interactive rebase correctly work 2023-04-15 17:26:08 +10:00
3422b1e218 test: update the UI to follow the new rebase type selection instead of confirm the previous popup 2023-04-15 17:26:08 +10:00
120dd1530a Make EditRebaseTodo more robust
It used to work on the assumption that rebasing commits in lazygit's model
correspond one-to-one to lines in the git-rebase-todo file, which isn't
necessarily true (e.g. when users use "git rebase --edit-todo" at the custom
command prompt and add a "break" between lines).
2023-04-15 08:36:03 +02: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
7f5465a27b fix flaky tests 2023-04-14 21:01:45 +10:00
6a340ec840 Reorder tests 2023-04-13 19:17:08 +02:00
3535cd0f94 Rename test files to match test names 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
4780953cef Merge pull request #2377 from shinhs0506/clear-staging-after-commit 2023-03-24 19:13:00 +11:00
776d8f4d2e refresh the staging panel on successful commit
apply formatting
2023-03-20 20:13:59 +11:00
4b4dccfd7d Fix "move patch into new commit" for partial hunk (#2507) 2023-03-18 18:17:47 +11:00
bf6e9a1bd3 Reenable failing test 2023-03-07 09:49:34 +01:00
a68cd6af9c Concatenate patches to apply them all at once
This fixes the problem that patching would stop at the first file that has a
conflict. We always want to patch all files.

Also, it's faster for large patches, and the code is a little bit simpler too.
2023-03-07 09:49:34 +01: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
161bb684fa Make integration test more robust
If you ran this test enough times it would eventually fail; this happened
whenever the resulting squashed commit had a sha that happened to start with
"02". We test that "commit 02" does not appear in the diff window, but in that
case it did, at the very top of the window.

A better fix might be to change the commit message that we use in CreateNCommits
to something other than "commit XY", but that would require touching tons of
tests, so this is the easier fix.
2023-02-27 08:53:06 +01:00
45d45d2397 show file tree by default in integration tests 2023-02-26 13:01:51 +11:00
f7e8b2dd71 cleanup integration test code 2023-02-26 12:54:13 +11:00
ff3c5d331e migrate merge conflict tests 2023-02-26 11:22:24 +11:00
dd1bf629b8 migrate patch building tests 2023-02-25 21:37:16 +11:00
db011d8e34 Improve staging panel integration tests 2023-02-25 11:35:41 +11:00
c63fed2074 migrate staging tests 2023-02-23 22:29:40 +11:00
1034962c7e migrate more tests 2023-02-22 22:29:01 +11:00
eabe7f462a migrate more tests 2023-02-22 21:57:32 +11:00
22c10479d5 migrate reflog integration tests 2023-02-22 21:15:03 +11:00
78f3a7a478 migrate interactive rebase integration tests 2023-02-22 19:36:31 +11:00
526c9dea9b Merge pull request #2293 from jesseduffield/feature/make-discarding-harder 2023-02-21 22:03:25 +11:00
bfde06d049 migrate push tests 2023-02-21 21:50:03 +11:00
2b6a109e38 migrate stash tests 2023-02-20 21:52:27 +11:00
71a30155dc rerun test generator 2023-02-20 19:29:15 +11:00
6ee20840b2 migrate switch tab from menu test 2023-02-20 19:28:52 +11:00
e1c376ef54 Merge pull request #2453 from stefanhaller/allow-rebasing-to-first-commit 2023-02-20 19:21:37 +11:00
0b55eaca1d add create tag from commit test 2023-02-20 19:01:08 +11:00
ee8c31880c add reset to tag test 2023-02-20 19:01:08 +11:00
daf8176dd7 add tag checkout test 2023-02-20 19:01:08 +11:00
082d342bf8 add tag tests 2023-02-20 19:01:08 +11:00
c5cd217a65 Allow squashing fixups above the first commit of a repo
This includes amending changes into a given commit, since that's implemented in
terms of the former.
2023-02-20 08:29:43 +01:00
9e2a3a87dd improved commit test 2023-02-20 18:20:23 +11:00
ac580ae6a0 migrate undo2 2023-02-20 18:20:23 +11:00
4b49bd406f Update pkg/integration/tests/branch/create_tag.go 2023-02-20 17:58:08 +11:00
7351907474 Add integration tests for rebasing to the initial commit 2023-02-20 07:40:05 +01:00
dd61c49a15 Better error message for trying to squash or fixup the first commit
It's not so much the total number of commits that matters here, it's just
whether we are on the first one. (This includes the other condition.)

This allows us to get rid of the condition in rebase.go.
2023-02-20 07:40:04 +01:00
36c2b00336 test: add an integration test for creating tag on branches 2023-02-19 23:35:38 +09:00
65bd0ab431 migrate undo test 2023-02-19 15:48:09 +11:00
93b9e1bd19 migrate merge conflict undo test 2023-02-19 15:48:09 +11:00
b5e325b0a4 migrate revert merge test 2023-02-19 15:48:09 +11:00