summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-23 14:37:21 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-23 14:37:22 +0900
commit96c6bb566ee5354a1b07530a94d3f85055e46032 (patch)
tree675b4ea93a5c4ffd9db000608d23a794f6cf7d4e /notes-merge.c
parentMerge branch 'rj/no-sign-compare' into maint (diff)
parentread_pack_header: handle signed/unsigned comparison in read result (diff)
downloadtgif-96c6bb566ee5354a1b07530a94d3f85055e46032.tar.xz
Merge branch 'jk/write-in-full-fix' into maint
Many codepaths did not diagnose write failures correctly when disks go full, due to their misuse of write_in_full() helper function, which have been corrected. * jk/write-in-full-fix: read_pack_header: handle signed/unsigned comparison in read result config: flip return value of store_write_*() notes-merge: use ssize_t for write_in_full() return value pkt-line: check write_in_full() errors against "< 0" convert less-trivial versions of "write_in_full() != len" avoid "write_in_full(fd, buf, len) != len" pattern get-tar-commit-id: check write_in_full() return against 0 config: avoid "write_in_full(fd, buf, len) < len" pattern
Diffstat (limited to 'notes-merge.c')
-rw-r--r--notes-merge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c
index c12b354f10..01cecbdda3 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -302,7 +302,7 @@ static void write_buf_to_worktree(const struct object_id *obj,
fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666);
while (size > 0) {
- long ret = write_in_full(fd, buf, size);
+ ssize_t ret = write_in_full(fd, buf, size);
if (ret < 0) {
/* Ignore epipe */
if (errno == EPIPE)