diff options
| author |  Jeff King <peff@peff.net> | 2016-07-08 05:08:54 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-07-08 09:47:28 -0700 |
| commit | 3d75bba28d8665ec43f1faffce38d5817c77ebe8 (patch) | |
| tree | a8b87326926d2ab316b83a77d35f6a521c76c33c /builtin/branch.c | |
| parent | am: ignore return value of write_file() (diff) | |
| download | tgif-3d75bba28d8665ec43f1faffce38d5817c77ebe8.tar.xz | |
branch: use non-gentle write_file for branch description
We use write_file_gently() to do this job currently.
However, if we see an error, we simply complain via
error_errno() and then end up exiting with an error code.
By switching to the non-gentle form, the function will die
for us, with a better error. It is more specific about which
syscall caused the error, and that mentions the
actual filename we're trying to write.
Our exit code for the error case does switch from "1" to
"128", but that's OK; it wasn't a meaningful documented code
(and in fact it was odd that it was a different exit code
than most other error conditions).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index 2ecde53bf8..15232c4a42 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -618,10 +618,7 @@ static int edit_branch_description(const char *branch_name) " %s\n" "Lines starting with '%c' will be stripped.\n", branch_name, comment_line_char); - if (write_file_gently(git_path(edit_description), "%s", buf.buf)) { - strbuf_release(&buf); - return error_errno(_("could not write branch description template")); - } + write_file(git_path(edit_description), "%s", buf.buf); strbuf_reset(&buf); if (launch_editor(git_path(edit_description), &buf, NULL)) { strbuf_release(&buf); |