Merge branch 'nd/fix-perf-parameters-in-tests'

diff --git a/builtin/branch.c b/builtin/branch.c
index 1ec9c02612d0391984b484a5850f45c277a3e804..873f624d1cc70e03da4c67b30f8c839b4afe099d 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -725,7 +725,7 @@ static int edit_branch_description(const char *branch_name)
        stripspace(&buf, 1);
 
        strbuf_addf(&name, "branch.%s.description", branch_name);
-       status = git_config_set(name.buf, buf.buf);
+       status = git_config_set(name.buf, buf.len ? buf.buf : NULL);
        strbuf_release(&name);
        strbuf_release(&buf);