Merge branch 'tb/ref-filter-empty-modifier'

diff --git a/notes-merge.c b/notes-merge.c
index b04d2f213116a6413d564107a6e12e3f7317accb..4352c34a6ee50f907f2d03e7d0ed1a596345a5d3 100644 (file)
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -302,14 +302,12 @@ 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)
                                break;
                        die_errno("notes-merge");
-               } else if (!ret) {
-                       die("notes-merge: disk full?");
                }
                size -= ret;
                buf += ret;