Skip to content

Commit

Permalink
git-gui: Update status bar during a merge.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shawn O. Pearce committed Jan 26, 2007
1 parent ce9735d commit ee3cfb5
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions git-gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ee3cfb5

Please sign in to comment.