undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Update status bar during a merge.

Browse Source 
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>
This commit is contained in:
Shawn O. Pearce 2007-01-26 03:58:56 -05:00
parent ce9735dfbd
commit ee3cfb5954
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-gui.sh
View File

@ -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