From 76bb40cde0e15e8d0e8493abb0bd18a5d6386ad7 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 8 May 2008 20:29:42 -0400 Subject: [PATCH] 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 --- lib/branch_delete.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" } } -- 2.30.2