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>

diff --git a/builtin/branch.c b/builtin/branch.c
index 852019ed8bfdae6ddb64d7d6c9fad7602309c5b5..97c736115f6cadfde094228c6258ad19e3e6b06f 100644 (file)
--- 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;
 }
 
        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)
 {
 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 {
                              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));
                        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);

                }
        }
 
                }
        }