From 46308ea1da6794bef1a99b0b1c892c46dec40146 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Tue, 15 Jan 2008 22:16:32 +1100 Subject: [PATCH] gitk: Select something appropriate on cherry-pick, branch reset and checkout This makes gitk select the new commit when cherry-picking, and select the new checked-out head when resetting or checking out a branch. This feels more natural because the user is usually more interested in that commit now than whatever was selected before. Signed-off-by: Paul Mackerras --- gitk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitk b/gitk index 8b4c61c56..c707c3c10 100755 --- a/gitk +++ b/gitk @@ -3397,7 +3397,7 @@ proc ordertoken {id} { set id [first_real_child $curview,$p] if {$id eq {}} { # it's a root - set tok [lindex $varctok($curview) $a] + set tok [lindex $varctok($curview) $varcid($curview,$p)] break } if {[llength $parents($curview,$id)] == 1} { @@ -7028,6 +7028,7 @@ proc cherrypick {} { } redrawtags $oldhead redrawtags $newhead + selbyid $newhead } notbusy cherrypick } @@ -7072,6 +7073,7 @@ proc resethead {} { dohidelocalchanges filerun $fd [list readresetstat $fd] nowbusy reset [mc "Resetting"] + selbyid $rowmenuid } } @@ -7144,6 +7146,7 @@ proc cobranch {} { redrawtags $headids($oldmainhead) } redrawtags $headmenuid + selbyid $headmenuid } if {$showlocalchanges} { dodiffindex -- 2.30.2