[PATCH v3 2/3] branch: add 'branch.namePrefix' config param

["VALERI Yoann via GitGitGadget" <gitgitgadget@gmail.com>]

From: VALERI Yoann <yoann.valeri@cea.fr>

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 <yoann.valeri@cea.fr>
---
 Documentation/config/branch.adoc |  5 +++++
 branch.c                         | 18 +++++++++++-------
 t/t3200-branch.sh                | 12 ++++++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Documentation/config/branch.adoc b/Documentation/config/branch.adoc
index a4db9fa5c8..202c9048b4 100644
--- a/Documentation/config/branch.adoc
+++ b/Documentation/config/branch.adoc
@@ -35,6 +35,11 @@ This option defaults to `never`.
 	value of this variable will be used as the default.
 	See linkgit:git-for-each-ref[1] field names for valid values.
 
+`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.
+
 `branch.<name>.remote`::
 	When on branch _<name>_, it tells `git fetch` and `git push`
 	which remote to fetch from or push to.  The remote to push to
diff --git a/branch.c b/branch.c
index c24d7ce823..5fb7280d47 100644
--- 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);
 }
 
 /*
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 550989a2bb..847a8355cf 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -1734,4 +1734,16 @@ test_expect_success 'create branch with --name-prefix' '
 	git branch -D blob-with-prefix-with-prefix
 '
 
+test_expect_success 'create branch with config prefix' '
+	test_config branch.namePrefix blob &&
+	git branch -- -with-prefix &&
+	test_must_fail git branch -- -with-prefix &&
+	test_config branch.namePrefix "@{current}" &&
+	git checkout main &&
+	git branch -- -with-prefix &&
+	test_ref_exists refs/heads/blob-with-prefix &&
+	test_ref_exists refs/heads/main-with-prefix &&
+	git branch -D blob-with-prefix main-with-prefix
+'
+
 test_done
-- 
gitgitgadget