undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/branch-description-unset' into maint-2.38

Browse Source 
"GIT_EDITOR=: git branch --edit-description" resulted in failure,
which has been corrected.

* jc/branch-description-unset:
  branch: do not fail a no-op --edit-desc
This commit is contained in:
Junio C Hamano 2022-10-25 17:11:37 -07:00
commit 1155c8efbb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/branch.c
View File

@ -599,10 +599,11 @@ static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION")
static int edit_branch_description(const char *branch_name) static int edit_branch_description(const char *branch_name)
{ {
int exists;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct strbuf name = 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') if (!buf.len || buf.buf[buf.len-1] != '\n')
strbuf_addch(&buf, '\n'); strbuf_addch(&buf, '\n');
strbuf_commented_addf(&buf, strbuf_commented_addf(&buf,
@ -619,7 +620,8 @@ static int edit_branch_description(const char *branch_name)
strbuf_stripspace(&buf, 1); strbuf_stripspace(&buf, 1);
strbuf_addf(&name, "branch.%s.description", branch_name); 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(&name);
strbuf_release(&buf); strbuf_release(&buf);

3
t/t3200-branch.sh
View File

@ -1382,6 +1382,9 @@ test_expect_success 'branch --delete --force removes dangling branch' '
' '
test_expect_success 'use --edit-description' ' test_expect_success 'use --edit-description' '
EDITOR=: git branch --edit-description &&
test_must_fail git config branch.main.description &&
write_script editor <<-\EOF && write_script editor <<-\EOF &&
echo "New contents" >"$1" echo "New contents" >"$1"
EOF EOF