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
Jesse Duffield
c713d19383
Merge pull request #2417 from stefanhaller/make_integration_tests_more_robust
2023-02-09 21:55:30 +11:00
Jesse Duffield
4f7324bad0
Merge pull request #2413 from stefanhaller/allow-ignore-whitespace-everywhere
2023-02-09 21:55:12 +11:00
Jesse Duffield
5e2254395a
fix linting issue
2023-02-09 21:45:14 +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
stk
5bb6198219
Allow ignoring whitespace in diff in commits panel
2023-02-07 12:14:29 +01:00
stk
bbaeab68e1
Better redrawing after toggling "ignore whitespace"
...
There's no need for refreshing anything; all that's needed is to re-focus the
selected list item. This way it will also work in other panels, which we are
about to add in the next commit.
2023-02-07 12:09:17 +01:00
stk
946c1dff99
Cleanup: remove extra space
2023-02-07 12:09:15 +01:00
stk
d838965a41
Make "Toggle whitespace in diff view" a global key binding
...
Since it is going to affect a number of views later in the branch, it's easier
to make it global than to find all views that are affected.
2023-02-07 09:25:38 +01:00
Jesse Duffield
469938ee9b
Merge pull request #2342 from knutwalker/override-git-sequence-editor-for-rebase
2023-02-05 13:52:35 +11:00
Ryooooooga
7bd0c779c7
fix: fix default color to be white
2023-02-03 23:36:59 +09:00
Jesse Duffield
c0e805718d
Merge pull request #2358 from phanithinks/#2319_default_screen_mode
2023-02-01 21:52:09 +11:00
Phanindra kumar Paladi
35c5f940a4
Fixing indent in user_config.go
2023-02-01 09:50:37 +05:30
Jesse Duffield
368d6437b8
Merge pull request #2373 from phanithinks/clipboard_patch_option_2357
2023-01-31 17:02:46 +11:00
Phanindra Kumar Paladi
01f0efb997
Merge branch 'master' into #2319_default_screen_mode
2023-01-29 10:25:14 +05:30
Phanindra kumar Paladi
d0851113d1
Skipping copy_patch_to_clipboard test case
2023-01-29 10:20:56 +05:30
Phanindra kumar Paladi
df58c75ca4
Fixed breaking integrtion tests(old)
2023-01-29 10:03:59 +05:30
Jesse Duffield
d8c7d47067
Merge pull request #2395 from stefanhaller/trailing-lf-when-copying-diff-lines
2023-01-29 14:19:29 +11:00
Jesse Duffield
f79a8c281f
Merge pull request #2398 from Ryooooooga/fix-detached-head
...
fix https://github.com/jesseduffield/lazygit/issues/1467
2023-01-29 14:19:05 +11:00
Jesse Duffield
996a1e469f
Merge pull request #2401 from Ryooooooga/disable-log-order
2023-01-29 14:05:31 +11:00
Jesse Duffield
18db5eafd4
Merge pull request #2384 from stefanhaller/disable-reword-in-editor-prompt
2023-01-29 13:43:23 +11:00
Ryooooooga
2183c157d4
feat(log): allow to disable git.log.order
2023-01-28 21:17:05 +09:00
Ryooooooga
5dec080719
fix: fix RefName of detached HEAD to works in Chinese
2023-01-27 20:45:18 +09:00
stk
fc38e3b54d
Don't omit final line feed when copying diff lines to clipboard
2023-01-26 10:30:05 +01:00
stk
93d845cb01
Cleanup: remove unused function RenderPlain
2023-01-26 10:30:05 +01:00
stk
67fb28e2b8
Add user config gui.skipRewordInEditorWarning
2023-01-26 09:01:22 +01:00
Jesse Duffield
679b0456f3
Merge pull request #2388 from Ryooooooga/remove-unused-texts
2023-01-26 13:46:01 +11:00
Jesse Duffield
f7f24dbfc1
better test
2023-01-26 13:25:56 +11:00
Ryooooooga
069af50f50
chore(i18n): remove unused texts
2023-01-24 21:24:46 +09:00
Phanindra kumar Paladi
c6929c36ae
Corrected test assert
2023-01-23 15:53:21 +05:30
Phanindra kumar Paladi
e8f4508cba
Fixed integration test case
2023-01-23 15:48:43 +05:30
stk
b8d33b8f7b
Extract helper function doRewordEditor
...
No behavior change, just a preparation for the next commit.
2023-01-22 15:59:32 +01:00
Phanindra kumar Paladi
946b8b5670
Fixed the lable in the custom_patch_options_panel.go
2023-01-18 21:13:31 +05:30
Phanindra kumar Paladi
d479a41cad
Added Integration testing the copy to clipboard in patchbuilding
2023-01-18 21:05:40 +05:30
Ryooooooga
7149cfeb11
fix: fix ReplacePlaceholderString
2023-01-18 20:56:22 +09:00
Phanindra kumar Paladi
265cdde7bc
Fixed typo
2023-01-18 10:14:48 +05:30
Phanindra kumar Paladi
e87fc4a229
Change key of clipboard copy
2023-01-18 05:50:47 +05:30
Phanindra kumar Paladi
f6f82091bc
Added copy to clipboard option to the patch options
2023-01-17 09:07:07 +05:30
Phanindra kumar Paladi
a11e91e651
replaced 'screenMode' to 'windowSize' in config
2023-01-16 20:07:21 +05:30
Phanindra kumar Paladi
f4ccb68464
Added screenMode configuration to gui configuration
2023-01-11 16:51:46 +05:30
Ryooooooga
21f8857d36
refactor: simplify log format
2023-01-06 11:15:33 +09:00
Ryooooooga
965f7bfcb2
feat(config): change git.commit.verbose to accept "default"
2023-01-06 11:15:33 +09:00
Ryooooooga
00b922604a
fix: fix goroutine leaks
2023-01-06 10:51:09 +09:00
Paul Horn
bc7873144e
Override GIT_SEQUENCE_EDITOR for rebase commands
...
I noticed that `$GIT_SEQUENCE_EDITOR` is overridden in `PrepareInteractiveRebaseCommand`
but not in `runSkipEditorCommand`.
Before this change, some commands such as `SquashAllAboveFixupCommits`
would not work when a different sequence editor, e.g.
[git-interactive-rebase-tool](https://github.com/MitMaro/git-interactive-rebase-tool )
is configured.
2023-01-01 04:37:19 +01:00
Jesse Duffield
1bb138c79c
Merge pull request #2341 from knutwalker/commit-verbose
2023-01-01 13:57:49 +11:00
Paul Horn
d98130c3ef
Add option to allow --verbose commit in editor commits
2023-01-01 02:01:04 +01:00
Ryooooooga
7c5f33980f
fix: improve backward compatibility
2022-12-31 22:47:21 +09:00
Jesse Duffield
5c42e1a5dc
defend against possible nil function
2022-12-30 22:49:08 +11:00
