diff options
| -rw-r--r-- | builtin/branch.c | 6 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 8c0b428104..ae08147572 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -576,10 +576,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, @@ -596,7 +597,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); diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 3ec3e1d730..30dff9e712 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1268,6 +1268,9 @@ test_expect_success 'attempt to delete a branch merged to its base' ' ' test_expect_success 'use --edit-description' ' + EDITOR=: git branch --edit-description && + test_must_fail git config branch.main.description && + write_script editor <<-\EOF && echo "New contents" >"$1" EOF |