Git 2.15-rc0

diff --git a/notes-merge.c b/notes-merge.c
index 597d43f65c664c04dc3045c3d913146321f9e97b..4352c34a6ee50f907f2d03e7d0ed1a596345a5d3 100644 (file)
--- 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;