From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 9 May 2008 00:29:42 +0000 (-0400)
Subject: git-gui: Delete branches with 'git branch -D' to clear config
X-Git-Tag: v1.5.6-rc0~52^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=76bb40cde0e15e8d0e8493abb0bd18a5d6386ad7;p=git.git

git-gui: Delete branches with 'git branch -D' to clear config

If we are deleting a local branch from refs/heads/ we need to
make sure any associated configuration stored in .git/config is
also removed (such as branch.$name.remote and branch.$name.merge).
The easiest way to do this is to use git-branch as that automatically
will look for and delete configuration keys as necessary.

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

diff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl
index 86c4f7337..ef1930b49 100644
--- a/lib/branch_delete.tcl
+++ b/lib/branch_delete.tcl
@@ -127,7 +127,7 @@ method _delete {} {
 	foreach i $to_delete {
 		set b [lindex $i 0]
 		set o [lindex $i 1]
-		if {[catch {git update-ref -d "refs/heads/$b" $o} err]} {
+		if {[catch {git branch -D $b} err]} {
 			append failed " - $b: $err\n"
 		}
 	}