From: Jeff King <peff@peff.net>
Date: Mon, 25 Sep 2017 20:27:57 +0000 (-0400)
Subject: notes-merge: drop dead zero-write code
X-Git-Tag: v2.15.0-rc0~19^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a1f3515da74504db0a046759d9ac1615a1d5f4b8;p=git-core%2Fgit.git

notes-merge: drop dead zero-write code

We call write_in_full() with a size that we know is greater
than zero. The return value can never be zero, then, since
write_in_full() converts such a failed write() into ENOSPC
and returns -1.  We can just drop this branch of the error
handling entirely.

Suggested-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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;