Jesse Duffield
0b55eaca1d
add create tag from commit test
2023-02-20 19:01:08 +11:00
Jesse Duffield
ee8c31880c
add reset to tag test
2023-02-20 19:01:08 +11:00
Jesse Duffield
daf8176dd7
add tag checkout test
2023-02-20 19:01:08 +11:00
Jesse Duffield
76109a4c44
sync test list whenever running a test in vscode
2023-02-20 19:01:08 +11:00
Jesse Duffield
082d342bf8
add tag tests
2023-02-20 19:01:08 +11:00
Jesse Duffield
39c56553b3
show tag message
2023-02-20 19:01:08 +11:00
Stefan Haller
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
Jesse Duffield
9e2a3a87dd
improved commit test
2023-02-20 18:20:23 +11:00
Jesse Duffield
ac580ae6a0
migrate undo2
2023-02-20 18:20:23 +11:00
Jesse Duffield
9e1e20fef2
Merge pull request #2421 from Ryooooooga/tag-on-branch
2023-02-20 18:20:16 +11:00
Jesse Duffield
4b49bd406f
Update pkg/integration/tests/branch/create_tag.go
2023-02-20 17:58:08 +11:00
Stefan Haller
7351907474
Add integration tests for rebasing to the initial commit
2023-02-20 07:40:05 +01:00
Stefan Haller
a349e886ce
Allow interactive rebasing all the way down to the first commit
...
Pass --root instead of a sha when we want to rebase down to the initial commit.
2023-02-20 07:40:05 +01:00
Stefan Haller
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
README-bot
1c3db24e44
Updated README.md
2023-02-20 06:33:57 +00:00
Jesse Duffield
15962e489d
Merge pull request #2451 from stefanhaller/edit-by-breaking-after-current-commit
2023-02-20 17:33:37 +11:00
Stefan Haller
ac9515d8c7
Revert "fix: improve backward compatibility"
...
Since we now require git 2.20, we don't need this any more.
This reverts commit 7c5f33980f
2023-02-19 16:13:31 +01:00
Ryoga
72a92d748f
test: fix TagNamesAt
...
Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>
2023-02-19 23:35:38 +09:00
Ryooooooga
36c2b00336
test: add an integration test for creating tag on branches
2023-02-19 23:35:38 +09:00
Ryooooooga
67b08ac239
feat: support to create tag on branch
2023-02-19 23:31:46 +09:00
Stefan Haller
67b8ef449c
Edit by breaking after current commit
...
Instead of rebasing from the commit below the current one and then setting the
current one to "edit", we rebase from the current one and insert a "break" after
it. In most cases the behavior is exactly the same as before, except that the
new method also works if the current commit is a merge commit. This is useful if
you want to create a new commit at the very beginning of your branch (by editing
the last commit before your branch).
2023-02-19 10:21:01 +01:00
Stefan Haller
bb856ad7c6
Bump minimum required git version to 2.20
...
We need this because the next commit is going to make use of the "break"
interactive rebase instruction, which was added in 2.20.
2023-02-19 10:20:14 +01:00
Jesse Duffield
b54b8ae746
Merge pull request #2450 from jesseduffield/migrate-more-tests
2023-02-19 15:51:17 +11:00
Jesse Duffield
65bd0ab431
migrate undo test
2023-02-19 15:48:09 +11:00
Jesse Duffield
93b9e1bd19
migrate merge conflict undo test
2023-02-19 15:48:09 +11:00
Jesse Duffield
a51f64814c
show snapshot of lazygit when test fails for easier investigation
2023-02-19 15:48:09 +11:00
Jesse Duffield
b5e325b0a4
migrate revert merge test
2023-02-19 15:48:09 +11:00
Jesse Duffield
88c76868ba
migrate initial open test
2023-02-19 15:48:09 +11:00
Jesse Duffield
e471567b5d
remove already migrated test
2023-02-19 15:48:09 +11:00
Jesse Duffield
13ee0f0a5d
migrate open to branches with cli arg test
2023-02-19 15:48:09 +11:00
Jesse Duffield
76a1b501f2
migrate more force push tests
2023-02-19 15:48:09 +11:00
Jesse Duffield
7201a91b69
remove unneeded config setting
2023-02-19 13:51:37 +11:00
Jesse Duffield
31d796ee75
migrate forcePush integration test
2023-02-19 13:38:15 +11:00
Jesse Duffield
0ac869a415
allow syncing tests from vscode
2023-02-19 13:38:07 +11:00
Jesse Duffield
9da9143aed
Merge pull request #2449 from jesseduffield/migrate-pull-tests
2023-02-19 12:49:49 +11:00
Jesse Duffield
b0383ba73a
update readme
2023-02-19 12:42:48 +11:00
Jesse Duffield
a3096e720c
migrate pullAndSetUpstream test
2023-02-19 12:42:48 +11:00
Jesse Duffield
c599aaed51
migrate pull integration test
2023-02-19 11:48:21 +11:00
Jesse Duffield
f999bbce7c
add code generator for creating tests list
2023-02-19 11:48:09 +11:00
Jesse Duffield
bff076c70a
rename key to Pull
2023-02-19 11:42:00 +11:00
Stefan Haller
979c3d6278
Fix yellow/red coloring of pushed/unpushed commits in branch commits panel ( #2448 )
2023-02-19 10:13:46 +11:00
README-bot
1fc8823825
Updated README.md
2023-02-18 23:11:27 +00:00
Jesse Duffield
eeb9c02836
Merge pull request #2447 from stefanhaller/cleanup-leftovers-from-2444
2023-02-19 10:11:12 +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
README-bot
627cc285f7
Updated README.md
2023-02-17 23:34:46 +00:00
Jesse Duffield
bee338f93b
Merge pull request #2444 from stefanhaller/fix-selecting-next-stageable-line
2023-02-18 10:34:31 +11:00
Jesse Duffield
01bf7f21e6
bump gocui
2023-02-18 10:28:09 +11:00
Jesse Duffield
c517d1e0a2
update view cursor when selecting new line in patch explorer view
2023-02-18 10:19:34 +11:00
stk
8cad8cda8f
Don't bother setting view cursor pos for staging/stagingSecondary views
...
Now that the cursor highlight is never shown (see previous commit), there's no
reason to update the cursor position any more.
2023-02-15 21:32:21 +01:00
stk
6b81e6adca
Turn highlighting off in staging/stagingSecondary views
...
There are two reasons for doing this:
1. The view cursor position is often out of sync with the selected line; see
first commit of this branch.
2. The highlighting is already turned off when the view loses focus, and never
turned back on thereafter. So just turn it off from the start then.
2023-02-15 21:29:38 +01:00
