[PATCH 3/8] branch: use non-gentle write_file for branch description
- From
Jeff King <peff@peff.net>
- Date
- Jul 8, 2016, 09:08 UTC
- Message-ID
- <20160708090854.GC10152@sigill.intra.peff.net>
- In-Reply-To
- <20160708090400.GA26594@sigill.intra.peff.net>
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> --- builtin/branch.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c index 2ecde53..15232c4 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);
-- 2.9.0.393.g704e522