From ee3cfb595415e2f076d5b90efba83088e5af961c Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Fri, 26 Jan 2007 03:58:56 -0500 Subject: [PATCH] git-gui: Update status bar during a merge. I got slightly confused when I did two merges in a row, as the status bar said "merge completed successfully" while the second merge was still running. Now we show what branches are actively being merged. Signed-off-by: Shawn O. Pearce --- git-gui.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 0c2dbbebe..6675d3018 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2658,7 +2658,7 @@ proc visualize_local_merge {w} { } proc start_local_merge_action {w} { - global HEAD + global HEAD ui_status_value current_branch set cmd [list git merge] set names {} @@ -2694,7 +2694,9 @@ than 15 branches, merge the branches in batches. return } - set cons [new_console "Merge" "Merging [join $names {, }]"] + set msg "Merging $current_branch, [join $names {, }]" + set ui_status_value "$msg..." + set cons [new_console "Merge" $msg] console_exec $cons $cmd finish_merge bind $w {} destroy $w -- 2.26.2