diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2008-05-08 20:29:42 -0400 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2008-05-08 20:29:42 -0400 |
commit | 76bb40cde0e15e8d0e8493abb0bd18a5d6386ad7 (patch) | |
tree | ff33f87a50e81ce0c5396399554c85dd5faeeb8d /lib | |
parent | git-gui: Setup branch.remote,merge for shorthand git-pull (diff) | |
download | tgif-76bb40cde0e15e8d0e8493abb0bd18a5d6386ad7.tar.xz |
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>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/branch_delete.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl index 86c4f73370..ef1930b491 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" } } |