Merge branch 'nd/maint-fix-add-typo-detection' (early part)

* 'nd/maint-fix-add-typo-detection' (early part): add: do not rely on dtype being NULL behavior
14 years ago · f80b6de4ec
1 changed files with 2 additions and 1 deletions
--- a/builtin/add.c
+++ b/builtin/add.c
@ -447,7 +447,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
				@@ -447,7 +447,8 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 			if (!seen[i] && pathspec[i][0]
 			    && !file_exists(pathspec[i])) {
 				if (ignore_missing) {
-					if (excluded(&dir, pathspec[i], DT_UNKNOWN))
+					int dtype = DT_UNKNOWN;
+					if (excluded(&dir, pathspec[i], &dtype))
 						dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i]));
 				} else
 					die("pathspec '%s' did not match any files",