From: Gerrit Pape Date: Sat, 09 Jun 2007 12:35:26 GMT Subject: [PATCH] git-branch: cleanup config file when deleting branches Message-ID: <20070609123526.3856.qmail@5cc189b277f9b4.315fe32.mid.smarden.org> In-Reply-To: <7vzm3akf6g.fsf@assigned-by-dhcp.cox.net> When deleting branches, remove the sections referring to these branches from the config file. Signed-off-by: Gerrit Pape --- On Fri, Jun 08, 2007 at 01:45:27AM -0700, Junio C Hamano wrote: > Hmph. Makes sense and might even be a maint material, but it > probably is safe not to do a behaviour change in maint. > > Tests? Sure, two tests added. Regards, Gerrit. builtin-branch.c | 9 +++++++-- t/t3200-branch.sh | 9 +++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/builtin-branch.c b/builtin-branch.c index 67f46c1..9addd1a 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -85,6 +85,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds) unsigned char sha1[20]; char *name = NULL; const char *fmt, *remote; + char section[PATH_MAX]; int i; int ret = 0; @@ -152,9 +153,13 @@ static int delete_branches(int argc, const char **argv, int force, int kinds) error("Error deleting %sbranch '%s'", remote, argv[i]); ret = 1; - } else + } else { printf("Deleted %sbranch %s.\n", remote, argv[i]); - + snprintf(section, sizeof(section), "branch.%s", + argv[i]); + if (git_config_rename_section(section, NULL) < 0) + warning("Update of config-file failed"); + } } if (name) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 6f6d884..1322bfb 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -171,6 +171,15 @@ test_expect_success 'test tracking setup via --track but deeper' \ test "$(git-config branch.my7.remote)" = local && test "$(git-config branch.my7.merge)" = refs/heads/o/o' +test_expect_success 'test deleting branch deletes branch config' \ + 'git-branch -d my7 && + test "$(git-config branch.my7.remote)" = "" && + test "$(git-config branch.my7.merge)" = ""' + +test_expect_success 'test deleting branch without config' \ + 'git-branch my7 s && + test "$(git-branch -d my7)" = "Deleted branch my7."' + # Keep this test last, as it changes the current branch cat >expect < 1117150200 +0000 branch: Created from master -- 1.5.2.1