X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-no-index.c;h=598687b50ac7b88ca0860faf1670d03047bb3603;hb=7ee3760e2c8f181f22d4b80afc03309e4f764385;hp=0dbd9dad8b100cdd4918571636ad3e9a1a0a2abf;hpb=c0f6f67b3d6c8afb89847b6b7bc187d7bed260eb;p=git.git

diff --git a/diff-no-index.c b/diff-no-index.c
index 0dbd9dad8..598687b50 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -38,6 +38,10 @@ static int get_mode(const char *path, int *mode)
 
 	if (!path || !strcmp(path, "/dev/null"))
 		*mode = 0;
+#ifdef _WIN32
+	else if (!strcasecmp(path, "nul"))
+		*mode = 0;
+#endif
 	else if (!strcmp(path, "-"))
 		*mode = create_ce_mode(0666);
 	else if (lstat(path, &st))
@@ -247,6 +251,7 @@ void diff_no_index(struct rev_info *revs,
 	else
 		revs->diffopt.paths = argv + argc - 2;
 	revs->diffopt.nr_paths = 2;
+	revs->diffopt.skip_stat_unmatch = 1;
 
 	DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
 	DIFF_OPT_SET(&revs->diffopt, NO_INDEX);