mirror of
https://github.com/git/git.git
synced 2024-10-03 14:01:22 +02:00
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>
This commit is contained in:
parent
ce9735dfbd
commit
ee3cfb5954
@ -2658,7 +2658,7 @@ proc visualize_local_merge {w} {
|
|||||||
}
|
}
|
||||||
|
|
||||||
proc start_local_merge_action {w} {
|
proc start_local_merge_action {w} {
|
||||||
global HEAD
|
global HEAD ui_status_value current_branch
|
||||||
|
|
||||||
set cmd [list git merge]
|
set cmd [list git merge]
|
||||||
set names {}
|
set names {}
|
||||||
@ -2694,7 +2694,9 @@ than 15 branches, merge the branches in batches.
|
|||||||
return
|
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
|
console_exec $cons $cmd finish_merge
|
||||||
bind $w <Destroy> {}
|
bind $w <Destroy> {}
|
||||||
destroy $w
|
destroy $w
|
||||||
|
Loading…
Reference in New Issue
Block a user