kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

branch: die on config error when editing branch description 

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Patrick Steinhardt 2016-02-22 12:23:25 +01:00 committed by Junio C Hamano
parent b81842cbbb
commit bd25f89014
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/branch.c
View File

@ -570,7 +570,6 @@ static const char edit_description[] = "BRANCH_DESCRIPTION";


static int edit_branch_description(const char *branch_name) static int edit_branch_description(const char *branch_name)
{ {
int status;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
struct strbuf name = STRBUF_INIT; struct strbuf name = STRBUF_INIT;


@ -595,11 +594,11 @@ 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);
status = git_config_set(name.buf, buf.len ? buf.buf : NULL); git_config_set_or_die(name.buf, buf.len ? buf.buf : NULL);
strbuf_release(&name); strbuf_release(&name);
strbuf_release(&buf); strbuf_release(&buf);


return status; return 0;
} }


int cmd_branch(int argc, const char **argv, const char *prefix) int cmd_branch(int argc, const char **argv, const char *prefix)