diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 22:44:59 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 22:44:59 +0400 |
| commit | 7b4e2b7e6aba677fcefffde79d0d3a53ae623b4f (patch) | |
| tree | ece06476fdfbb8ea18973ff3b1eddd62cea1ca39 /builtin | |
| parent | de20e4472157d0ed53bdc6374185a2ce3c7c9f3d (diff) | |
| parent | c9df6f4574c0174efd5000e0e99dca97ddb5034c (diff) | |
Merge branch 'ef/mingw-write'
* ef/mingw-write:
mingw: remove mingw_write
prefer xwrite instead of write
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 4941a6c36a..e576a7fdc6 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")); |