notes-merge: drop dead zero-write code

peff · gitster · commit a1f3515da745 · 2017-09-26T12:55:59.000+09:00
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 &lt;jrnieder@gmail.com&gt;
Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Reviewed-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -308,8 +308,6 @@ static void write_buf_to_worktree(const struct object_id *obj,`
`308`	`308`	`if (errno == EPIPE)`
`309`	`309`	`break;`
`310`	`310`	`die_errno("notes-merge");`
`311`		`- } else if (!ret) {`
`312`		`- die("notes-merge: disk full?");`
`313`	`311`	`}`
`314`	`312`	`size -= ret;`
`315`	`313`	`buf += ret;`