summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-09 16:27:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-09 16:27:09 (GMT)
commit3a2ce799811c7df98a1b0cd3541f68227e587483 (patch)
treee60572cdbd98de8a4b859fab44679c8d1b84e185 /builtin/branch.c
parent7f27ac56a549fff45e85dae48cec713a340b0616 (diff)
parent5ee29aefac94d4ed11fc5101c89697f39057abb5 (diff)
downloadgit-3a2ce799811c7df98a1b0cd3541f68227e587483.zip
git-3a2ce799811c7df98a1b0cd3541f68227e587483.tar.gz
git-3a2ce799811c7df98a1b0cd3541f68227e587483.tar.bz2
Merge branch 'nd/maint-branch-desc-doc'
Teach various forms of "format-patch" command line to identify what branch the patches are taken from, so that the branch description is picked up in more cases. * nd/maint-branch-desc-doc: format-patch: pick up branch description when no ref is specified format-patch: pick up correct branch name from symbolic ref t4014: a few more tests on cover letter using branch description branch: delete branch description if it's empty config.txt: a few lines about branch.<name>.description
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index 1ec9c02..873f624 100644
--- 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);