diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:49 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:49 +0900 |
commit | cb1083ca23c2f78140b66b925ed0b82fe400eea5 (patch) | |
tree | c78509d2b9fbe79c99ed1acb83bf43886b4d0c0c /notes-merge.c | |
parent | d4e93836a6a072e392b20d7daf604fd41e15ecf9 (diff) | |
parent | 8a1a8d2ad1b41a0a28d37d1d21ee9620a23e91eb (diff) | |
download | git-cb1083ca23c2f78140b66b925ed0b82fe400eea5.tar.gz git-cb1083ca23c2f78140b66b925ed0b82fe400eea5.tar.xz |
Merge branch 'jk/read-in-full'
Code clean-up to prevent future mistakes by copying and pasting
code that checks the result of read_in_full() function.
* jk/read-in-full:
worktree: check the result of read_in_full()
worktree: use xsize_t to access file size
distinguish error versus short read from read_in_full()
avoid looking at errno for short read_in_full() returns
prefer "!=" when checking read_in_full() result
notes-merge: drop dead zero-write code
files-backend: prefer "0" for write_in_full() error check
Diffstat (limited to 'notes-merge.c')
-rw-r--r-- | notes-merge.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/notes-merge.c b/notes-merge.c index 597d43f65..4352c34a6 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -308,8 +308,6 @@ static void write_buf_to_worktree(const struct object_id *obj, if (errno == EPIPE) break; die_errno("notes-merge"); - } else if (!ret) { - die("notes-merge: disk full?"); } size -= ret; buf += ret; |