pack-objects: respect --local/--honor-pack-keep/--incremental when bitmap is in use

diff --git a/builtin/branch.c b/builtin/branch.c
index 2ecde53bf838777e191926557c0c8190cdc7d09a..bf0672578f3b1a875b7cc691a27f77e96f394909 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -614,14 +614,11 @@ static int edit_branch_description(const char *branch_name)
        if (!buf.len || buf.buf[buf.len-1] != '\n')
                strbuf_addch(&buf, '\n');
        strbuf_commented_addf(&buf,
-                   "Please edit the description for the branch\n"
-                   "  %s\n"
-                   "Lines starting with '%c' will be stripped.\n",
+                   _("Please edit the description for the branch\n"
+                     "  %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_buf(git_path(edit_description), buf.buf, buf.len);
        strbuf_reset(&buf);
        if (launch_editor(git_path(edit_description), &buf, NULL)) {
                strbuf_release(&buf);