mailinfo: move [ps]_hdr_data to struct mailinfo

diff --git a/builtin/branch.c b/builtin/branch.c
index 58aa84f1e85212772d15175679e95263eae75123..ff05869949b7c5c4cd0034e7a0ba54e2adeae6b4 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -776,7 +776,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));