diff options
| author |  René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2012-10-18 14:04:08 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-10-18 14:36:16 -0700 |
| commit | 22ed79275360a3dbb480e2c510a94c4b817afad2 (patch) | |
| tree | 89923cc44f6e6385c93e39a8ddc9a0838b805c41 | |
| parent | branch: factor out check_branch_commit() (diff) | |
| download | tgif-22ed79275360a3dbb480e2c510a94c4b817afad2.tar.xz | |
branch: factor out delete_branch_config()
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>
| -rw-r--r-- | builtin/branch.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 852019ed8b..97c736115f 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -172,6 +172,15 @@ static int check_branch_commit(const char *branchname, const char *refname, 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, int quiet) { @@ -237,17 +246,13 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, bname.buf); ret = 1; } else { - struct strbuf buf = STRBUF_INIT; if (!quiet) printf(remote_branch ? _("Deleted remote branch %s (was %s).\n") : _("Deleted branch %s (was %s).\n"), bname.buf, find_unique_abbrev(sha1, DEFAULT_ABBREV)); - strbuf_addf(&buf, "branch.%s", bname.buf); - if (git_config_rename_section(buf.buf, NULL) < 0) - warning(_("Update of config-file failed")); - strbuf_release(&buf); + delete_branch_config(bname.buf); } } |