summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Erik Faye-Lund <kusmabite@gmail.com>2014-01-17 15:17:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-17 12:09:26 -0800
commit7edc02f4deedb3a11abeb328dc2596b2886c2f47 (patch)
treef592d5687516f56552669dd16e34bfbc8d538be1 /builtin
parentGit 1.8.5.3 (diff)
downloadtgif-7edc02f4deedb3a11abeb328dc2596b2886c2f47.tar.xz
prefer xwrite instead of write
Our xwrite wrapper already deals with a few potential hazards, and are as such more robust. Prefer it instead of write to get the robustness benefits everywhere. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Reviewed-and-improved-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 41fb66dec2..a6a38ee5ba 100644
--- 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"));