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 <spearce@spearce.org>
Shawn O. Pearce committed
Jan 26, 2007 at 03:58 UTC
ee3cfb595415e2f076d5b90efba83088e5af961c
1 file changed
+4
-2
git-gui.sh
+4
-2
@@ -2658,7 +2658,7 @@ proc visualize_local_merge {w} {
2658
}
2659
2660
proc start_local_merge_action {w} {
2661
- global HEAD
2661
+ global HEAD ui_status_value current_branch
2662
2663
set cmd [list git merge]
2664
set names {}
@@ -2694,7 +2694,9 @@ than 15 branches, merge the branches in batches.
2694
return
2695
}
2696
2697
- set cons [new_console "Merge" "Merging [join $names {, }]"]
2697
+ set msg "Merging $current_branch, [join $names {, }]"
2698
+ set ui_status_value "$msg..."
2699
+ set cons [new_console "Merge" $msg]
2700
console_exec $cons $cmd finish_merge
2701
bind $w <Destroy> {}
2702
destroy $w