unpack-trees.c: assume submodules are clean during check-out

diff --git a/builtin-add.c b/builtin-add.c
index 159117106a3db52b430cb1bf82d094e54693f690..de5c108f8f5765e78c8ca15dcad58f3796015acc 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -40,42 +40,29 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p
        dir->nr = dst - dir->entries;
 
        for (i = 0; i < specs; i++) {
-               struct stat st;
-               const char *match;
-               if (seen[i])
-                       continue;
-
-               match = pathspec[i];
-               if (!match[0])
-                       continue;
-
-               /* Existing file? We must have ignored it */
-               if (!lstat(match, &st)) {
-                       struct dir_entry *ent;
-
-                       ent = dir_add_name(dir, match, strlen(match));
-                       ent->ignored = 1;
-                       if (S_ISDIR(st.st_mode))
-                               ent->ignored_dir = 1;
-                       continue;
-               }
-               die("pathspec '%s' did not match any files", match);
+               if (!seen[i] && !file_exists(pathspec[i]))
+                       die("pathspec '%s' did not match any files",
+                                       pathspec[i]);
        }
 }
 
-static void fill_directory(struct dir_struct *dir, const char **pathspec)
+static void fill_directory(struct dir_struct *dir, const char **pathspec,
+               int ignored_too)
 {
        const char *path, *base;
        int baselen;
 
        /* Set up the default git porcelain excludes */
        memset(dir, 0, sizeof(*dir));
-       dir->exclude_per_dir = ".gitignore";
-       path = git_path("info/exclude");
-       if (!access(path, R_OK))
-               add_excludes_from_file(dir, path);
-       if (!access(excludes_file, R_OK))
-               add_excludes_from_file(dir, excludes_file);
+       if (!ignored_too) {
+               dir->collect_ignored = 1;
+               dir->exclude_per_dir = ".gitignore";
+               path = git_path("info/exclude");
+               if (!access(path, R_OK))
+                       add_excludes_from_file(dir, path);
+               if (excludes_file != NULL && !access(excludes_file, R_OK))
+                       add_excludes_from_file(dir, excludes_file);
+       }
 
        /*
         * Calculate common prefix for the pathspec, and
@@ -219,13 +206,11 @@ int cmd_add(int argc, const char **argv, const char *prefix)
        }
        pathspec = get_pathspec(prefix, argv + i);
 
-       fill_directory(&dir, pathspec);
+       fill_directory(&dir, pathspec, ignored_too);
 
        if (show_only) {
                const char *sep = "", *eof = "";
                for (i = 0; i < dir.nr; i++) {
-                       if (!ignored_too && dir.entries[i]->ignored)
-                               continue;
                        printf("%s%s", sep, dir.entries[i]->name);
                        sep = " ";
                        eof = "\n";
@@ -237,25 +222,13 @@ int cmd_add(int argc, const char **argv, const char *prefix)
        if (read_cache() < 0)
                die("index file corrupt");
 
-       if (!ignored_too) {
-               int has_ignored = 0;
-               for (i = 0; i < dir.nr; i++)
-                       if (dir.entries[i]->ignored)
-                               has_ignored = 1;
-               if (has_ignored) {
-                       fprintf(stderr, ignore_warning);
-                       for (i = 0; i < dir.nr; i++) {
-                               if (!dir.entries[i]->ignored)
-                                       continue;
-                               fprintf(stderr, "%s", dir.entries[i]->name);
-                               if (dir.entries[i]->ignored_dir)
-                                       fprintf(stderr, " (directory)");
-                               fputc('\n', stderr);
-                       }
-                       fprintf(stderr,
-                               "Use -f if you really want to add them.\n");
-                       exit(1);
+       if (dir.ignored_nr) {
+               fprintf(stderr, ignore_warning);
+               for (i = 0; i < dir.ignored_nr; i++) {
+                       fprintf(stderr, "%s\n", dir.ignored[i]->name);
                }
+               fprintf(stderr, "Use -f if you really want to add them.\n");
+               exit(1);
        }
 
        for (i = 0; i < dir.nr; i++)