mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ef/mingw-write'

Browse Source 
* ef/mingw-write:
  mingw: remove mingw_write
  prefer xwrite instead of write
This commit is contained in:
Junio C Hamano
2014-01-27 10:44:59 -08:00
parent de20e44721 c9df6f4574
commit 7b4e2b7e6a
5 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@ -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"));