6041 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stefan Haller	5dff9af027	Disable staging and unstaging lines or hunks when the diff context size is 0 (#4235) ... - **PR Description** Git diff and patch doesn't work reliably with a context size of 0, so disable it in this case (and discarding changes as well). Magit does the same, see https://github.com/magit/magit/issues/4222. Staging entire files by pressing space in the Files panel is still possible, of course. Fixes #4233.	2025-02-06 08:53:43 +01:00
Stefan Haller	437daf2f74	Disable staging and unstaging lines or hunks when the diff context size is 0 ... Git diff and patch doesn't work reliably with a context size of 0, so disable it in this case (and discarding changes as well). Magit does the same, see https://github.com/magit/magit/issues/4222. Staging entire files by pressing space in the Files panel is still possible, of course.	2025-02-05 16:07:22 +01:00
Stefan Haller	c0141685fe	Fix tag being truncated when copying to clipboard (#4232) ... Copy the whole tag to clipboard instead of truncating to the value of TruncateCopiedCommitHashesTo. - **PR Description** My PR for copying the tag to clipboard was recently merged (#4219). While using LazyGit built from the latest master I noticed that some tags were being truncated, turns out it was due to a bug I introduced on that previous PR. Sorry for that.	2025-02-04 08:57:22 +01:00
Bruno Jesus	4856c96521	Fix tag truncated when copying to clipboard ... Copy the whole tag to clipboard instead of truncating to the value of TruncateCopiedCommitHashesTo.	2025-02-03 21:25:34 +00:00
Stefan Haller	49f8dc2ce4	Improve error reporting on config migration (#4210) ... - **PR Description** closes #4209 - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc	2025-01-30 09:14:18 +01:00
Karem Abdul-Samad	afc3061c51	Improve error reporting on config migration	2025-01-30 09:01:17 +01:00
Stefan Haller	2bed09ef67	Show confirmation menu when trying to amend changes while there are conflicts (#4222) ... - **PR Description** Show confirmation menu when trying to amend changes while there are conflicts, as this is very likely not what users want at that point. Resolves #4208. - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [x] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc	2025-01-30 08:55:56 +01:00
Stefan Haller	0a78d0016e	Show confirmation menu when trying to amend changes while there are conflicts	2025-01-30 08:53:34 +01:00
Stefan Haller	c0e3922d02	Fix flicker when showing backround fetch status (#4223) ... - **PR Description** Fix occasional ugly flicker when showing the background fetch status (recently introduced with #4215). - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc	2025-01-30 08:52:37 +01:00
Stefan Haller	638c9c5fe7	Fix flicker when showing the status of a background fetch ... This was recently introduced, but it was done the wrong way. WithWaitingStatusSync should only be called from the main thread, and it is meant to be used for updating the bottom line while the UI is blocked. It is a bad idea to call this from a background thread, and it results in ugly flicker (occasionally). Use the newly extracted WithWaitingStatusImpl instead, this is the same as WithWaitingStatus (which is exactly what we need) but without the implicit OnWorker, which we don't want because we are on a background thread already.	2025-01-30 08:49:58 +01:00
Stefan Haller	e48e7a2ebc	Extract the inner part of WithWaitingStatus as a synchronous variant of it ... This is the same as WithWaitingStatus but without the implicit OnWorker, for those who are on a background thread already.	2025-01-30 08:49:58 +01:00
Jesse Duffield	d2723ff2dd	Add option to delete local and remote tag (#4217) ... - **PR Description** Option to delete both local and remote tag, closes #4203. - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [x] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc <!-- Be sure to name your PR with an imperative e.g. 'Add worktrees view' see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples -->	2025-01-30 09:36:12 +11:00
Anvar Umuraliev	7db8fb8e9c	Add option to delete local and remote tag	2025-01-30 09:05:17 +11:00
Jesse Duffield	abf914c923	Copy tags to clipboard (#4218) ... - **PR Description** This PR adds a new feature that allows users to copy tags to the clipboard. It can be used from the Commits "Copy to clipboard" menu and also from the Tags list. Closes #4219 * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [x] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [x] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc	2025-01-30 08:56:07 +11:00
Bruno Jesus	698f9287d4	Rename NoTags to CommitHasNoTags	2025-01-28 23:11:06 +00:00
Bruno Jesus	632695f71c	Integration tests for copy tags to clipboard ... Adds integration test in order to confirm if tags are being properly sent to the clipboard	2025-01-28 00:34:57 +00:00
Bruno Jesus	ef0d319686	Add copy commit tags to clipboard toast message	2025-01-28 00:33:55 +00:00
Bruno Jesus	0397ede8a6	Document copy tag keybinding ... Add the default keybinding for the "Copy tag to clipboard" function on the Tags section.	2025-01-27 22:07:08 +00:00
Bruno Jesus	333802fffc	Copy Tags to clipboard ... Add an option to copy tag(s) to the clipboard. Works on both the Tags and Commits sections.	2025-01-27 21:53:13 +00:00
Stefan Haller	3722824298	Show background fetch status in bottom line (#4215) ... - **PR Description** This shows a status as if the user had typed 'f' manually in the files panel. I want this particularly for the first fetch after startup. There are often situations where I need to wait for this first background fetch to be done before I can do what I want (e.g. rebase my branch onto its base branch, or check out a branch that my coworker has told me they just pushed), but currently it's hard to tell when that is. For every subsequent background fetch after the first one it is less important, but it hopefully doesn't hurt, and it might be nice to have some visual indication that background activity is happening.	2025-01-27 14:01:05 +01:00
Stefan Haller	542478546d	Show background fetch status in bottom line ... This shows a status as if the user had typed 'f' manually in the files panel. I want this particularly for the first fetch after startup. There are often situations where I need to wait for this first background fetch to be done before I can do what I want (e.g. rebase my branch onto its base branch, or check out a branch that my coworker has told me they just pushed), but currently it's hard to tell when that is. For every subsequent background fetch after the first one it is less important, but it hopefully doesn't hurt, and it might be nice to have some visual indication that background activity is happening.	2025-01-27 13:59:04 +01:00
Stefan Haller	9ea2ff8f41	Remove call to Render() ... As far as I can tell, this is not needed. The call to Refresh at the end of backgroundFetch takes care of redrawing after refreshing. The call was added in 2fc1498517, that's a long time ago, and we had multiple big refactorings since then. Maybe it was needed back then but no longer is today.	2025-01-27 13:59:04 +01:00
Stefan Haller	55236802c3	Expose {{.SelectedCommitRange}} to custom commands (#4204) ... - **PR Description** Expose `{{.SelectedCommitRange}}` to custom commands. It has fields .To and .From (the hashes of the last and the first selected commits, respectively), and it is useful for creating git commands that act on a range of commits. Fixes #4184. - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [x] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc	2025-01-27 09:03:47 +01:00
Stefan Haller	4baf008ac7	Expose {{.SelectedCommitRange}} to custom commands ... It has fields .To and .From (the hashes of the last and the first selected commits, respectively), and it is useful for creating git commands that act on a range of commits.	2025-01-27 08:53:50 +01:00
Stefan Haller	d768327814	Fix checking out a different branch while pushing a branch for the first time (#4214) ... - **PR Description** When pushing a branch that didn't have an upstream yet, we use the command line git push --set-upstream origin HEAD:branch-name The HEAD: part of this is too unspecific; when checking out a different branch while the push is still running, then git will set the upstream branch on the newly checked out branch, not the branch that was being pushed. This might be considered a bug in git; you might expect that it resolves HEAD at the beginning of the operation, and uses the result at the end. But we can easily work around this by explicitly supplying the real branch name instead of HEAD. Fixes #4207. - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc	2025-01-27 08:50:24 +01:00
Stefan Haller	0864affc8f	Fix checking out a different branch while pushing a branch for the first time ... When pushing a branch that didn't have an upstream yet, we use the command line git push --set-upstream origin HEAD:branch-name The HEAD: part of this is too unspecific; when checking out a different branch while the push is still running, then git will set the upstream branch on the newly checked out branch, not the branch that was being pushed. This might be considered a bug in git; you might expect that it resolves HEAD at the beginning of the operation, and uses the result at the end. But we can easily work around this by explicitly supplying the real branch name instead of HEAD.	2025-01-26 10:22:19 +01:00
Stefan Haller	40d6800fd3	Fix adding blank line at end of commit message (#4182) ... - **PR Description** This fixes a bug where adding enough new lines to a commit message description such that it becomes taller than the window so that the window needs to resize vertically, the cursor wouldn't move to the added blank line, but stay at the end of the previous line. This was a regression introduced with #4152.	2025-01-20 17:54:59 +01:00
Stefan Haller	20d0b4316d	Only avoid the blank line at end of view if view is not editable ... For editable views it is important to actually show the blank line so that we can put the cursor there for typing. This fixes problems with adding blank lines at the end of longer commit messages.	2025-01-20 17:52:53 +01:00
Stefan Haller	fe429c6184	Bump gocui	2025-01-20 17:52:51 +01:00
Stefan Haller	a77dcbe3a1	Add '--' to 'git rev-list' to disambiguate branch name from path (#4185) ... - **PR Description** When deleting a local branch that has the same name as a file known to git (say `test`), a popup with the following error is shown: ``` fatal: ambiguous argument 'test': both revision and filename Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' ``` The command log reveals this: ``` git rev-list --max-count=1 test ^HEAD ^refs/heads/main ``` - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc	2025-01-20 09:25:50 +01:00
Erich Fussi	2a87c048b9	Add '--' to 'git rev-list' to disambiguate branch name from path	2025-01-19 14:33:42 +01:00
Jesse Duffield	c03b892270	Bump tcell to fix broken deployment (#4178) ... - **PR Description** See https://github.com/jesseduffield/lazygit/actions/runs/12829856652/job/35776769332 and https://github.com/gdamore/tcell/issues/768	2025-01-18 00:36:18 +11:00
Jesse Duffield	5e26183ae1	Bump tcell to fix broken deployment	2025-01-18 00:31:57 +11:00
Jesse Duffield	ab7b5f6d84	Improve undo action to restore files upon undoing a commit (#4167) ... - **PR Description** Right now, undoing a commit performs a hard reset, which also discards all the changes from that commit. This PR adds new config options (and a new `undo` section) which allow users to choose between `hard` and `soft` reset modes when undoing commits. Personally, I think that the default should be `soft`, because the state before the commit had the files, so undoing a commit should put the files where they were before. But this PR keeps `hard` as the default and does not change current behavior. - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [x] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [x] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [x] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc <!-- Be sure to name your PR with an imperative e.g. 'Add worktrees view' see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples -->	2025-01-18 00:17:12 +11:00
Gabriel Lanata	4065175a58	Improve undo action to restore files upon undoing a commit	2025-01-18 00:07:15 +11:00
Stefan Haller	43106b6c7f	Collapse/uncollapse all files in tree (#4131)	2025-01-13 21:18:38 +01:00
Mauricio Trajano	7bea41534b	Collapse/expand all files in tree ... Co-authored-by: Stefan Haller <stefan@haller-berlin.de>	2025-01-13 21:13:11 +01:00
Stefan Haller	14a91d9829	Bump gocui (and tcell) (#4166) ... This updates our tcell dependency to v2.8.0, adding support for ghostty and tmux-256color. This will hopefully fix #4133, and it might also fix #2962 and #3434 (but I don't understand enough about these to tell).	2025-01-12 13:51:33 +01:00
Stefan Haller	274e24d75e	Bump gocui (and tcell) ... This updates our tcell dependency to v2.8.0, adding support for ghostty and tmux-256color.	2025-01-12 13:48:52 +01:00
Stefan Haller	a1a8cd114d	Add ability to configure branch color patterns using regex (#4130) ... - **PR Description** Add ability to specify color patterns in the `branchColorPatterns` config using regex, ex. `JIRA-\d+` would match all branch names in the form `JIRA-456`. Example config: ```yaml gui: branchColorPatterns: 'docs/.+': 'black' # make all branches prefixed with docs/ have a black color 'feature/collapse-all': 'red' # make a specfic branch name red 'IDEA-\d+': 'blue' # make all branches with the prefix `IDEA-` followed by a digit, blue ```	2025-01-12 13:47:17 +01:00
Mauricio Trajano	c64a7904b7	Add ability to configure branch color patterns	2025-01-12 13:44:26 +01:00
Stefan Haller	3e623cd1ce	Remove the automatic coloring of certain branch names ... We used to automatically color branches starting with "feature/", "bugfix/", or "hotfix/". For those who don't want this, it's a bit non-obvious to turn off, but it's actually pretty easy to configure manually for those who want this, so we just remove this default coloring.	2025-01-11 22:13:33 +01:00
Jesse Duffield	6da99a49a4	Cut a new release automatically each month (#4146) ... - **PR Description** I regularly struggle to stay on top of releases, and that's because I like to spend some time polishing the release notes and I don't always have time for that. But that shouldn't block releases, so now releases will happen automatically on the first Saturday of each month. In order to block an automatic release, we simply need to add a blocks-release label on any open PR or issue. - **Please check if the PR fulfills these requirements** * [ ] Cheatsheets are up-to-date (run `go generate ./...`) * [ ] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [ ] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [ ] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [ ] Docs have been updated if necessary * [ ] You've read through your own file changes for silly mistakes etc <!-- Be sure to name your PR with an imperative e.g. 'Add worktrees view' see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples -->	2025-01-11 15:47:43 +11:00
Jesse Duffield	977a01172f	Automatically cut release each month	2025-01-11 15:44:00 +11:00
Jesse Duffield	91cb1ff29a	Standardise on 'screen mode' naming convention (#4142) ... We had some conflicting names: screen-mode, window-size, and window-maximisation. I think panel-size sounds good. - **PR Description** - **Please check if the PR fulfills these requirements** * [x] Cheatsheets are up-to-date (run `go generate ./...`) * [x] Code has been formatted (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting)) * [x] Tests have been added/updated (see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md) for the integration test guide) * [x] Text is internationalised (see [here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation)) * [ ] If a new UserConfig entry was added, make sure it can be hot-reloaded (see [here](https://github.com/jesseduffield/lazygit/blob/master/docs/dev/Codebase_Guide.md#using-userconfig)) * [x] Docs have been updated if necessary * [x] You've read through your own file changes for silly mistakes etc <!-- Be sure to name your PR with an imperative e.g. 'Add worktrees view' see https://github.com/jesseduffield/lazygit/releases/tag/v0.40.0 for examples -->	2025-01-11 14:30:12 +11:00
Jesse Duffield	28d10c26a4	Standardise on 'screen mode' name ... We had some conflicting names so we're standardising on screen mode	2025-01-11 14:25:48 +11:00
Stefan Haller	2c321011db	Use interactive shell for running shell commands only if shell is bash or zsh (#4159) ... - **PR Description** Fix running shell commands with fish or nushell. Fixes #4153.	2025-01-10 00:26:35 +01:00
Stefan Haller	dbd407c01d	Use interactive shell for running shell commands only if shell is bash or zsh ... We use an interactive shell so that users can use their custom shell aliases in lazygit's shell prompt, which is convenient; however, this only really works for shells like bash or zsh. We know it doesn't work for fish or nushell (because these use different names for the $? variable); so use an interactive shell only if the user's shell is either bash or zsh.	2025-01-09 09:29:31 +01:00
Stefan Haller	b8d5e481bb	Fix micro editor preset (#4156) ... - **PR Description** I don't know what was I thinking when making #3049, because Micro does not actually support `--` as delimiter between options and files. As such, when trying to edit files with `micro` set as editor, an empty file named `--` would be open first. This PR fixes this by explicitly defining a preset for `micro`. I've double-tested it to make sure that it doesn't behave wierdly any more :D	2025-01-09 08:51:39 +01:00
Nikita Karamov	2b3525bfd6	Fix micro editor preset	2025-01-09 08:48:59 +01:00