diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-25 06:24:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 06:24:06 (GMT) |
| commit | c50424a6f07f17ff9b06927606df650cd73a09a3 (patch) | |
| tree | 8dad3903bf837ace4c3e05f223004864aead881d /notes-merge.c | |
| parent | 94982b69994c448dafbc0721398f8944ab5856e3 (diff) | |
| parent | f48ecd38cb86b86f01914e875d74c92c077bf493 (diff) | |
| download | git-c50424a6f07f17ff9b06927606df650cd73a09a3.zip git-c50424a6f07f17ff9b06927606df650cd73a09a3.tar.gz git-c50424a6f07f17ff9b06927606df650cd73a09a3.tar.bz2 | |
Merge branch 'jk/write-in-full-fix'
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index b04d2f2..597d43f 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) |