Sync with 1.8.5.5

diff --git a/builtin/merge.c b/builtin/merge.c
index 4941a6c36ab215fdb709ac58a3aea69218025dbb..e576a7fdc619303a65e859920a1ab6936db2626c 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -367,7 +367,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
                        sha1_to_hex(commit->object.sha1));
                pretty_print_commit(&ctx, commit, &out);
        }
-       if (write(fd, out.buf, out.len) < 0)
+       if (write_in_full(fd, out.buf, out.len) != out.len)
                die_errno(_("Writing SQUASH_MSG"));
        if (close(fd))
                die_errno(_("Finishing SQUASH_MSG"));