1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-03 00:57:52 +02:00
Commit Graph

704 Commits

Author SHA1 Message Date
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
72a92d748f test: fix TagNamesAt
Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>
2023-02-19 23:35:38 +09: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
88c76868ba migrate initial open test 2023-02-19 15:48:09 +11:00
13ee0f0a5d migrate open to branches with cli arg test 2023-02-19 15:48:09 +11:00
76a1b501f2 migrate more force push tests 2023-02-19 15:48:09 +11:00
7201a91b69 remove unneeded config setting 2023-02-19 13:51:37 +11:00
31d796ee75 migrate forcePush integration test 2023-02-19 13:38:15 +11:00
b0383ba73a update readme 2023-02-19 12:42:48 +11:00
a3096e720c migrate pullAndSetUpstream test 2023-02-19 12:42:48 +11:00
c599aaed51 migrate pull integration test 2023-02-19 11:48:21 +11:00
f999bbce7c add code generator for creating tests list 2023-02-19 11:48:09 +11:00
bff076c70a rename key to Pull 2023-02-19 11:42:00 +11:00
stk
4d39668743 Undo a change made in #2444 that we didn't end up needing 2023-02-18 09:53:31 +01:00
c517d1e0a2 update view cursor when selecting new line in patch explorer view 2023-02-18 10:19:34 +11:00
stk
b499eba1a8 Select next stageable line correctly after staging a range of lines
We already have this very convenient behavior of jumping to the next stageable
line after staging something. However, while this worked well for staging
single lines or hunks, it didn't work correctly when staging a range of lines;
in this case we want to start searching from the first line of the range.
2023-02-15 21:29:00 +01:00
stk
97daec7228 Add test demonstrating selection bug when staging a range of lines
The selected line is not in the right position after staging a range of lines;
see next commit.
2023-02-15 21:28:05 +01:00
stk
ff2a799200 Make SelectedLine/SelectedLineIdx work in staging/stagingSecondary views
While we try to keep the view's cursor position in sync with the context state's
selectedLineIdx (at least when pressing up or down), there are enough situations
where the two run out of sync; for example when initially opening the view, or
after staging a hunk, or when scrolling the view using the wheel. While it would
be possible to fix these situations to keep them always in sync, it doesn't seem
worth it, because the view's cursor position isn't really used for anything
else. So we rather special-case the SelectedLine/SelectedLineIdx functions of
ViewDriver to query the context state's selectedLineIdx directly if it is a
patch explorer context.
2023-02-15 21:22:11 +01:00
31fcec16d9 Merge pull request #2429 from stefanhaller/do-not-autosquash-in-regular-rebase 2023-02-15 20:21:08 +11:00
3cfdae4116 migrate submodule reset test 2023-02-12 18:12:01 +11:00
d7956c481d migrate submodule enter test 2023-02-12 18:12:01 +11:00
7a3291a1f7 fix test 2023-02-12 18:12:01 +11:00
08c2b46d04 better visibility for tui 2023-02-12 10:47:45 +11:00
1c48842277 migrate submodule remove test 2023-02-12 10:47:45 +11:00
010f6d7f6e migrate submodule add test 2023-02-12 10:47:41 +11:00
984eb95cb7 chore: remove UNKNOWN_VIEW_ERROR_MSG 2023-02-10 21:26:51 +09:00
stk
1da762c295 Explicitly pass --no-autosquash when rebasing
This fixes the problem shown in the previous commit.
2023-02-09 18:21:11 +01:00
stk
e357c00d4d Add an integration test showing a problem with autosquash during normal rebase
For users who have the rebase.autoSquash git config set to true, any regular
rebase will squash fixups in addition to rebasing. Not good -- we'll fix that in
the next commit.
2023-02-09 17:35:20 +01:00
c713d19383 Merge pull request #2417 from stefanhaller/make_integration_tests_more_robust 2023-02-09 21:55:30 +11:00
stk
b243f30f48 Disable ~/.gitconfig when running integration tests
A global ~/.gitconfig file can have influence on how integration tests behave;
in my case, I had the option "merge.conflictStyle" set to "diff3", which made
the integration test "cherry_pick_conflict" fail because the diff was different
from what the test expected.

Make this more robust by telling git to ignore the global config file when
running tests.
2023-02-07 17:26:45 +01:00
stk
e57843d947 Add integration test for ignoring whitespace in diff 2023-02-07 13:33:10 +01:00
368d6437b8 Merge pull request #2373 from phanithinks/clipboard_patch_option_2357 2023-01-31 17:02:46 +11:00
d0851113d1 Skipping copy_patch_to_clipboard test case 2023-01-29 10:20:56 +05:30
5dec080719 fix: fix RefName of detached HEAD to works in Chinese 2023-01-27 20:45:18 +09:00
f7f24dbfc1 better test 2023-01-26 13:25:56 +11:00
c6929c36ae Corrected test assert 2023-01-23 15:53:21 +05:30
e8f4508cba Fixed integration test case 2023-01-23 15:48:43 +05:30
d479a41cad Added Integration testing the copy to clipboard in patchbuilding 2023-01-18 21:05:40 +05:30
6c3671f807 appease linter 2022-12-30 22:47:56 +11:00