jesseduffield.lazygit/pkg/integration/tests
Stefan Haller c712b1d0fe Better local branch delete confirmation
Currently we try to delete a branch normally, and if git returns an error and
its output contains the text "branch -D", then we prompt the user to force
delete, and try again using -D. Besides just being ugly, this has the
disadvantage that git's logic to decide whether a branch is merged is not very
good; it only considers a branch merged if it is either reachable from the
current head, or from its own upstream. In many cases I want to delete a branch
that has been merged to master, but I don't have master checked out, so the
current branch is really irrelevant, and it should rather (or in addition) check
whether the branch is reachable from one of the main branches. The problem is
that git doesn't know what those are.

But lazygit does, so make the check on our side, prompt the user if necessary,
and always use -D. This is both cleaner, and works better.

See this mailing list discussion for more:
https://lore.kernel.org/git/bf6308ce-3914-4b85-a04b-4a9716bac538@haller-berlin.de/
2024-09-28 11:19:32 +02:00
..
bisect Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
branch Better local branch delete confirmation 2024-09-28 11:19:32 +02:00
cherry_pick Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
commit Fix copying commit author to clipboard 2024-09-23 09:47:14 +02:00
config Fix loading customCommands from per-repo config file 2024-08-24 11:01:25 +02:00
conflicts Add config git.autoStageResolvedConflicts 2024-09-02 18:12:47 +02:00
custom_commands Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
demo [DATALAD RUNCMD] Do interactive fixing of some ambigous typos 2024-08-27 18:03:00 +02:00
diff Add a simple integration test for non-sticky range diff 2024-08-28 19:51:15 +02:00
file Ask to auto-stage unstaged files when continuing a rebase after resolving conflicts 2024-09-02 18:24:36 +02:00
filter_and_search [DATALAD RUNCMD] run codespell throughout fixing typos automagically 2024-08-27 18:03:00 +02:00
filter_by_author Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
filter_by_path Keep the same commit selected when exiting filtering mode 2024-03-28 12:23:46 +01:00
interactive_rebase Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
misc [DATALAD RUNCMD] run codespell throughout fixing typos automagically 2024-08-27 18:03:00 +02:00
patch_building Fix custom patch operations on added files 2024-06-23 12:40:31 +02:00
reflog Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
shared Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
shell_commands Rename "Custom Command" to "Shell Command" 2024-08-17 10:56:03 +02:00
staging Assert that the search status view is visible 2024-06-23 11:43:12 +02:00
stash Switch to Files panel after popping a stash 2024-09-06 13:15:37 +02:00
status Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
submodule Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
sync Remove ColoredBranchStatus and branchStatusColor 2024-06-03 13:02:46 +02:00
tag Make it possible to handle toasts in integration tests 2024-01-14 17:42:03 +01:00
ui Allow using </> and ,/. in sticky range select mode in patch explorer 2024-08-24 10:56:20 +02:00
undo Support range select in rebase actions 2024-01-23 17:23:56 +11:00
worktree Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
test_list.go Add test that demonstrates bug with deleting remote branch with different name 2024-09-28 11:19:32 +02:00
test_list_generator.go Make test_list_generator.go print what it's doing 2023-09-29 20:40:15 +02:00
tests.go Set working directory in lazygit test command 2024-01-12 19:59:31 +11:00