From d070c4cb17e807c157aaeb24d9b80a1112334e57 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 25 Jan 2007 17:07:03 -0500 Subject: [PATCH] git-gui: Don't switch branches if changing to the current branch. Its pointless to switch to the current branch, so don't do it. We are already on it and the current index and working directory should just be left alone. Signed-off-by: Shawn O. Pearce --- git-gui.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index 7792eb4..faae6ce 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2271,6 +2271,13 @@ The rescan will be automatically started now. return } + # -- Don't do a pointless switch. + # + if {$current_branch eq $new_branch} { + unlock_index + return + } + if {$repo_config(gui.trustmtime) eq {true}} { switch_branch_stage2 {} $new_branch } else { -- 2.11.4.GIT