Merge branch 'jc/branch-description-unset'

[thirdparty/git.git] / builtin / branch.c

diff --git a/builtin/branch.c b/builtin/branch.c
index 55cd9a6e9984fc66334a7e78bd65294c628e34fb..c570fdb1ca2d78df18c6656142868e0086dff29f 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -599,10 +599,11 @@ static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION")
 
 static int edit_branch_description(const char *branch_name)
 {
+       int exists;
        struct strbuf buf = STRBUF_INIT;
        struct strbuf name = STRBUF_INIT;
 
-       read_branch_desc(&buf, branch_name);
+       exists = !read_branch_desc(&buf, branch_name);
        if (!buf.len || buf.buf[buf.len-1] != '\n')
                strbuf_addch(&buf, '\n');
        strbuf_commented_addf(&buf,
@@ -619,7 +620,8 @@ static int edit_branch_description(const char *branch_name)
        strbuf_stripspace(&buf, 1);
 
        strbuf_addf(&name, "branch.%s.description", branch_name);
-       git_config_set(name.buf, buf.len ? buf.buf : NULL);
+       if (buf.len || exists)
+               git_config_set(name.buf, buf.len ? buf.buf : NULL);
        strbuf_release(&name);
        strbuf_release(&buf);