diff options
| author |  Patrick Steinhardt <ps@pks.im> | 2016-02-22 12:23:25 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-02-22 10:23:52 -0800 |
| commit | bd25f890146f7e39b18f67113f1bf2e4741a4fb4 (patch) | |
| tree | 3e17f05ec92995ce4f034a021706c93fe058a114 /builtin | |
| parent | branch: die on config error when unsetting upstream (diff) | |
| download | tgif-bd25f890146f7e39b18f67113f1bf2e4741a4fb4.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/branch.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 09782876b8..c043cfc729 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -570,7 +570,6 @@ static const char edit_description[] = "BRANCH_DESCRIPTION"; static int edit_branch_description(const char *branch_name) { - int status; struct strbuf buf = 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_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(&buf); - return status; + return 0; } int cmd_branch(int argc, const char **argv, const char *prefix) |