Merge branch 'ls/p4-lfs'

diff --git a/builtin/branch.c b/builtin/branch.c
index b7a60f41e7012f032adae74cc7619f41ebd961c3..01f9530822d9f4c060e2bcfa6d80b03618f526d9 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -582,7 +582,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(git_path(edit_description), 0, "%s", buf.buf)) {
+       if (write_file_gently(git_path(edit_description), "%s", buf.buf)) {
                strbuf_release(&buf);
                return error(_("could not write branch description template: %s"),
                             strerror(errno));