X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge-file.c;h=3605960c2d9692514a6df0f344f3c3269cf1de3c;hb=e32c0a9c38a126c9eb8ff8f2fdc1fb8875400bbe;hp=adce6d4635a4153428368073677cd74a9bafc045;hpb=a6828f536119c3288b0be772e3870f1a464d017d;p=git.git

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index adce6d463..3605960c2 100644
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -57,7 +57,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
 
 		if (!f)
 			ret = error("Could not open %s for writing", filename);
-		else if (fwrite(result.ptr, result.size, 1, f) != 1)
+		else if (result.size &&
+			 fwrite(result.ptr, result.size, 1, f) != 1)
 			ret = error("Could not write to %s", filename);
 		else if (fclose(f))
 			ret = error("Could not close %s", filename);