diff options
| author | Gerrit Pape <pape@smarden.org> | 2007-06-09 12:40:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-09 11:53:05 -0700 |
| commit | f1eccbab638df66a7d8ec881f6f695514b26f44f (patch) | |
| tree | 6e0cdad8a3154bf0ec71ba4295887c4071bb364e | |
| parent | e58db03bbee4af96e60b6ac88b84c1c11b8b037e (diff) | |
| download | git-f1eccbab638df66a7d8ec881f6f695514b26f44f.tar.gz git-f1eccbab638df66a7d8ec881f6f695514b26f44f.tar.xz | |
git-branch: cleanup config file when deleting branches
When deleting branches, remove the sections referring to these branches
from the config file.
Signed-off-by: Gerrit Pape <pape@smarden.org>
| -rw-r--r-- | builtin-branch.c | 9 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index da480519d..bd4748f84 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 6f6d8844e..f1793d0b9 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 2>&1)" = "Deleted branch my7."' + # Keep this test last, as it changes the current branch cat >expect <<EOF 0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master |