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

diff --git a/builtin/branch.c b/builtin/branch.c
index 12203fdcc8179a41ba43ee87eb8f906bc45380e3..bf0672578f3b1a875b7cc691a27f77e96f394909 100644 (file)
--- 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_buf(git_path(edit_description), buf.buf, buf.len);
        strbuf_reset(&buf);
        if (launch_editor(git_path(edit_description), &buf, NULL)) {
                strbuf_release(&buf);