Stefan HallerandClaude Opus 5.5 fb1b6ed1c1 Don't offer to push or pull branches merged into a local main branch ...

When pushing master, lazygit offers to push other branches along with
it if they were merged into master locally and have unpushed commits.
Pulling master offers to update such branches in the same way. These
branches aren't part of a stack, so the menu only adds an extra step to
an ordinary push or pull.

This happens because a branch counts as stacked below the current one
if its tip is one of the current branch's commits that aren't merged
into a main branch yet. A commit's merged status only looks at the
remote branch of each main branch. So until master is pushed, the
commits that were merged into it locally count as unmerged. The same
goes for pushing or pulling a feature branch on top of such a master.

Treat the commits that a local main branch contains as merged too, so
that the search for stacked branches stops at a main branch.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

2026-10-31 15:12:36 +01:00

..

amend_helper.go

…

app_status_helper.go

…

bisect_helper.go

…

branch_stack_test.go

Don't offer to push or pull branches merged into a local main branch

2026-10-31 15:12:36 +01:00

branch_stack.go

Don't offer to push or pull branches merged into a local main branch

2026-10-31 15:12:36 +01:00

branches_helper.go

Remove a worktree inside the repo properly when discarding it

2026-10-15 20:51:34 +02:00

cherry_pick_helper.go

…

commits_helper_test.go

…

commits_helper.go

…

confirmation_helper_test.go

…

confirmation_helper.go

Use Sprint for text that isn't a format string

2026-10-16 07:53:03 +02:00

credentials_helper.go

…

custom_patch_helper.go

Remove the explorer behavior behind the retired panels

2026-10-05 11:44:42 +02:00

diff_helper.go

Show an error when editing a file of a diff that doesn't exist

2026-10-10 13:58:05 +02:00

diff_line_file_menu.go

Add a menu of the diff's files to jump to one directly

2026-10-05 12:14:02 +02:00

diff_line_helper_test.go

Make the path of a diff's lines absolute once per file

2026-10-14 08:41:50 +02:00

diff_line_helper.go

Leave out the text of the rows of a rendering that states its lines

2026-10-14 08:41:50 +02:00

diff_line_parser_test.go

Leave out the text of the rows of a rendering that states its lines

2026-10-14 08:41:50 +02:00

diff_line_parser.go

Leave out the text of the rows of a rendering that states its lines

2026-10-14 08:41:50 +02:00

diff_line_plain_text.go

Make the path of a diff's lines absolute once per file

2026-10-14 08:41:50 +02:00

diff_line_queries_test.go

Ask a diff where each of its files begins

2026-10-05 12:14:02 +02:00

diff_line_queries.go

Leave out the text of the rows of a rendering that states its lines

2026-10-14 08:41:50 +02:00

diff_line_raw_fallback.go

Link the file names in a diffstat to where each file's diff begins

2026-10-05 12:44:17 +02:00

diff_line_restore.go

Leave out the text of the rows of a rendering that states its lines

2026-10-14 08:41:50 +02:00

diff_line_selection.go

Leave out the text of the rows of a rendering that states its lines

2026-10-14 08:41:50 +02:00

diff_stat_links_test.go

Link the file names in a diffstat to where each file's diff begins

2026-10-05 12:44:17 +02:00

diff_stat_links.go

Link the file names in a diffstat to where each file's diff begins

2026-10-05 12:44:17 +02:00

drag_autoscroller_test.go

…

drag_autoscroller.go

Restore the terminal if a timer or errgroup function panics

2026-10-14 20:28:53 +02:00

files_helper.go

…

fixup_helper_test.go

…

fixup_helper.go

Restore the terminal if a timer or errgroup function panics

2026-10-14 20:28:53 +02:00

gpg_helper.go

…

helpers.go

Remove the explorer behavior behind the retired panels

2026-10-05 11:44:42 +02:00

host_helper.go

Ask one place whether a branch has a pull request

2026-10-05 12:05:39 +02:00

inline_status_helper.go

…

menu_key.go

…

merge_and_rebase_helper.go

…

merge_conflicts_helper.go

…

mode_helper.go

Name diff options after the view that now uses them

2026-10-05 11:44:42 +02:00

record_directory_helper.go

…

refresh_helper_test.go

Show a directory that git status reports as a whole as a single entry

2026-10-15 09:13:12 +02:00

refresh_helper.go

Ask git which commits a bisect hasn't ruled out yet

2026-10-31 12:17:43 +01:00

refs_helper.go

Remove the explorer behavior behind the retired panels

2026-10-05 11:44:42 +02:00

repos_helper_test.go

…

repos_helper.go

Move gitDirOfRepo to git_commands

2026-10-15 09:13:12 +02:00

search_helper.go

…

signal_handling_windows.go

…

signal_handling.go

Restore the terminal if a goroutine panics

2026-10-14 20:28:53 +02:00

snake_helper.go

…

sub_commits_helper.go

Load all commits when the selection is near the end of the loaded ones

2026-10-31 11:27:58 +01:00

suggestions_helper.go

…

suspend_resume_helper.go

…

tags_helper.go

…

update_helper.go

…

upstream_helper_test.go

…

upstream_helper.go

…

view_helper.go

…

window_arrangement_helper_test.go

…

window_arrangement_helper.go

…

window_helper.go

…

working_tree_helper.go

Don't stage nested repositories when committing with nothing staged

2026-10-15 20:51:34 +02:00

worktree_helper_test.go

…

worktree_helper.go

…