X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-no-index.c;h=4ebc1dbd87d9b90ad2aaa5c7d4601761e2d1d724;hb=ee0400df4eb13ea9b1ee3f03a50e479048f1780f;hp=7273a7a0b648cc8cbd6dce2043a6e544b87d28b6;hpb=cd12f536129357d5347c1953db69bde68b5f46c9;p=git.git

diff --git a/diff-no-index.c b/diff-no-index.c
index 7273a7a0b..4ebc1dbd8 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))
@@ -229,7 +233,7 @@ void diff_no_index(struct rev_info *revs,
 	if (prefix) {
 		int len = strlen(prefix);
 
-		revs->diffopt.paths = xcalloc(2, sizeof(char*));
+		revs->diffopt.paths = xcalloc(2, sizeof(char *));
 		for (i = 0; i < 2; i++) {
 			const char *p = argv[argc - 2 + i];
 			/*