From: Shawn O. Pearce <spearce@spearce.org>
Date: Sun, 21 Jan 2007 09:54:01 +0000 (-0500)
Subject: git-gui: Don't delete the test target branch.
X-Git-Tag: gitgui-0.6.0~103
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3dcdfdf015746c7ec10d915705c1a76cc9d9de31;p=git.git

git-gui: Don't delete the test target branch.

Its possible for the user to select a branch for the merge test
(while deleting branches) and also select that branch for deletion.
Doing so would have bypassed our merge check for that branch, as
a branch is always a strict subset of itself.  So we will simply
skip over a branch and not delete it if that is the branch which
the user selected for the merge check.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index c9143973d..e79a0ae07 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1816,6 +1816,7 @@ proc do_delete_branch_action {w} {
 		set b [$w.list.l get $i]
 		if {[catch {set o [exec git rev-parse --verify $b]}]} continue
 		if {$delete_branch_checkhead} {
+			if {$b eq $delete_branch_head} continue
 			if {[catch {set m [exec git merge-base $o $delete_branch_head]}]} continue
 			if {$o ne $m} {
 				lappend not_merged $b