This patch adds a new configuration parameter for the branch creation
feature: 'branch.namePrefix'. It corresponds to the '--name-prefix'
option of 'git branch' made as configuration parameter, and behaves
exactly like it.

Signed-off-by: VALERI Yoann <redacted>
---

diff --git a/Documentation/config/branch.adoc b/Documentation/config/branch.adoc

@@ -35,6 +35,11 @@ This option defaults to `never`.
+`branch.namePrefix`::
+       When a new branch is created with `git branch`, use the provided value as
+       prefix for its name. Can be '@{current}' to use the current branch's name
+       as prefix.

diff --git a/branch.c b/branch.c

@@ -368,18 +368,22 @@ int read_branch_desc(struct strbuf *buf, const char *branch_name)
 void add_branch_prefix(const char *name_prefix,
                                           const char *current_branch, struct strbuf *buf)
 {
-       int value = 0;
+       char *config_prefix = NULL;

-       if (!name_prefix)
-               return;
+       if (!name_prefix) {
+               if (repo_config_get_string(the_repository, "branch.namePrefix",
+                                                                  &config_prefix))
+                       return;

-       if (name_prefix[0] != '@') {
-               strbuf_addstr(buf, name_prefix);
-               return;
+               name_prefix = config_prefix;
        }

-       if (strcmp(name_prefix, "@{current}") == 0)
+       if (name_prefix[0] != '@')
+               strbuf_addstr(buf, name_prefix);
+       else if (strcmp(name_prefix, "@{current}") == 0)
                strbuf_addstr(buf, current_branch);
+
+    free(config_prefix);
 }