mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

branch: factor out delete_branch_config()

Browse Source 
Provide a small helper function for deleting branch config sections.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2012-10-18 14:04:08 +02:00
committed by Junio C Hamano
parent f5d0e162c4
commit 22ed792753
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/branch.c
View File

@ -172,6 +172,15 @@ static int check_branch_commit(const char *branchname, const char *refname,
return 0; return 0;
} }
static void delete_branch_config(const char *branchname)
{
struct strbuf buf = STRBUF_INIT;
strbuf_addf(&buf, "branch.%s", branchname);
if (git_config_rename_section(buf.buf, NULL) < 0)
warning(_("Update of config-file failed"));
strbuf_release(&buf);
}
static int delete_branches(int argc, const char **argv, int force, int kinds, static int delete_branches(int argc, const char **argv, int force, int kinds,
int quiet) int quiet)
{ {
@ -237,17 +246,13 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
bname.buf); bname.buf);
ret = 1; ret = 1;
} else { } else {
struct strbuf buf = STRBUF_INIT;
if (!quiet) if (!quiet)
printf(remote_branch printf(remote_branch
? _("Deleted remote branch %s (was %s).\n") ? _("Deleted remote branch %s (was %s).\n")
: _("Deleted branch %s (was %s).\n"), : _("Deleted branch %s (was %s).\n"),
bname.buf, bname.buf,
find_unique_abbrev(sha1, DEFAULT_ABBREV)); find_unique_abbrev(sha1, DEFAULT_ABBREV));
strbuf_addf(&buf, "branch.%s", bname.buf); delete_branch_config(bname.buf);
if (git_config_rename_section(buf.buf, NULL) < 0)
warning(_("Update of config-file failed"));
strbuf_release(&buf);
} }
} }