1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00
Commit Graph

147 Commits

Author SHA1 Message Date
037e957282 fix PullMergeConflict integration test 2023-02-25 11:39:24 +11:00
78f3a7a478 migrate interactive rebase integration tests 2023-02-22 19:36:31 +11:00
38c7030b0f mention path in tooltips 2023-02-20 19:28:45 +11:00
31b8524fe6 Add tooltips for discarding 2023-02-20 19:28:45 +11:00
0ae34aeeb7 Make discarding items less error prone
The menu is opened by `d` so this makes it harder to mess things up by
accidentally pressing `dd`.
2023-02-20 19:28:45 +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
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
9e1e20fef2 Merge pull request #2421 from Ryooooooga/tag-on-branch 2023-02-20 18:20:16 +11: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
67b08ac239 feat: support to create tag on branch 2023-02-19 23:31:46 +09:00
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
65bd0ab431 migrate undo test 2023-02-19 15:48:09 +11:00
bff076c70a rename key to Pull 2023-02-19 11:42:00 +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
39c20bc634 chore: change to work return-alt1 on all views 2023-02-11 21:19:47 +09:00
5e2254395a fix linting issue 2023-02-09 21:45:14 +11:00
stk
67fb28e2b8 Add user config gui.skipRewordInEditorWarning 2023-01-26 09:01:22 +01:00
stk
b8d33b8f7b Extract helper function doRewordEditor
No behavior change, just a preparation for the next commit.
2023-01-22 15:59:32 +01:00
af5b3be286 integrate snake game into lazygit 2022-12-30 12:18:59 +11:00
fb15a2f4f8 Merge pull request #2326 from Ryooooooga/fix-scroll
fix https://github.com/jesseduffield/lazygit/issues/2309
2022-12-24 19:20:23 +11:00
7bdba1abe4 fix(#2309): fix diff scroll 2022-12-20 22:25:49 +09:00
5679efe174 Merge pull request #2239 from bdach/u2f-key-prompts
close https://github.com/jesseduffield/lazygit/issues/2230
2022-12-20 21:44:29 +11:00
0af63daf18 workingtree controller fixed with new references for commit in staged menu 2022-12-01 09:12:18 +11:00
8b894d7bf5 wip: commit logic in helper and reported in files/staging controllers 2022-12-01 09:12:18 +11:00
65d6d7fb2d fix ignore file keybinding 2022-11-30 19:36:35 +11:00
1a1f042f49 Add credential prompts for U2F-backed SSH keys
The 8.2 release of OpenSSH added support for FIDO/U2F hardware
authenticators, which manifests in being able to create new types of SSH
key, named `ecdsa-sk` nad `ed25519-sk`. This is relevant to lazygit,
as those SSH keys can be used to authorise git operations over SSH, as
well as signing git commits. Actual code changes are required for
correct support, as the authentication process for these types of keys
is different than the process for types supported previously.

When an operation requiring credentials is initialised with a U2F
authenticator-backed key, the first prompt is:

	Enter PIN for ${key_type} key ${path_to_key}:

at which point the user is supposed to enter a numeric (and secret) PIN,
specific to the particular FIDO/U2F authenticator using which the SSH
keypair was generated. Upon entering the correct key, the user is
supposed to physically interact with the authenticator to confirm
presence. Sometimes this is accompanied by the following text prompt:

	Confirm user presence for key ${key_type} ${key_fingerprint}

This second prompt does not always occur and it is presumed that the
user will know to perform this step even if not prompted specifically.
At this stage some authenticator devices may also begin to blink a LED
to indicate that they're waiting for input.

To facilitate lazygit's interoperability with these types of keys, add
support for the first PIN prompt, which allows "fetch", "pull", and
"push" git operations to complete.
2022-11-30 13:34:32 +11:00
52a2e4c1dc fix: fix ambiguous branch name
test: add an integration test for checkout branch by name

fix: fix full ref name of detached head

refactor: refactor current branch loader

chore: use field name explicitly
2022-11-14 19:05:07 +11:00
b33ec5a050 Merge pull request #1980 from ajhynes7/stash-untracked-changes 2022-11-14 18:46:53 +11:00
3e73dacce3 Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
684d1e955e lint: try deleting blank line 2022-11-13 19:51:30 -03:30
3c436b3457 lint: delete unused argument from handleStashSave 2022-11-13 11:02:06 -03:30
d26350502c stop switching focus to commits view when resetting 2022-11-13 03:26:50 +00:00
a47e72892a Merge branch 'master' into stash-untracked-changes 2022-11-01 16:08:34 -02:30
3103398e31 chore: refactor rename stash 2022-10-16 09:30:04 +09:00
eceb3a5aa6 chore: refactor rename stash 2022-10-16 09:12:43 +09:00
11316b7a48 feat: add rename stash 2022-10-16 09:12:42 +09:00
8c46a0110d Merge branch 'master' into stash-untracked-changes 2022-10-06 22:59:06 -02:30
bc8050d8ac typo 2022-09-17 15:10:41 -07:00
b8900baf1a remove deprecated calls 2022-09-17 15:10:41 -07:00
e189546acb refactor: move checks for clean working tree 2022-09-15 21:48:49 -02:30
c7733aa5e5 refactor: rename method to StashIncludeUntrackedChanges 2022-09-15 21:48:49 -02:30
50cf7ac5bc refactor: change command order 2022-09-15 21:48:49 -02:30
c7fd218308 fix: add condition to if statement 2022-09-15 21:48:49 -02:30
7ddb80a13e feat: add stash option to include untracked changes 2022-09-15 21:48:48 -02:30
0ff5b74d80 IgnoreOrExclude should be a menu 2022-08-11 14:23:02 +02:00
7410acd1aa move merge conflicts code into controller 2022-08-07 11:16:03 +10:00
445a625b56 rename merging context to mergeConflicts 2022-08-06 18:05:00 +10:00
524bf83a4a refactor to only have one context per view 2022-08-06 13:49:11 +10:00
debc58b6c5 fix popup focus issue 2022-08-01 22:09:48 +10:00