diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-26 03:58:56 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-26 03:58:56 -0500 |
| commit | ee3cfb595415e2f076d5b90efba83088e5af961c (patch) | |
| tree | 637bf5074eb115b35a0075250b6cd0fc78f59132 | |
| parent | ce9735dfbd77ab7cbcb97ba8749b2f6eaa7f2527 (diff) | |
| download | git-ee3cfb595415e2f076d5b90efba83088e5af961c.tar.gz git-ee3cfb595415e2f076d5b90efba83088e5af961c.tar.xz | |
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>
| -rwxr-xr-x | git-gui.sh | 6 |
1 files 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> {} destroy $w |