git-apply: require -p<n> when working in a subdirectory.

diff --git a/builtin-add.c b/builtin-add.c
index 72d2853176f9c6d8b7c678bce64f5f482c2c5345..87e16aa2200f90e2f12673e856040ed29ee7d119 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -3,15 +3,14 @@
  *
  * Copyright (C) 2006 Linus Torvalds
  */
-#include <fnmatch.h>
-
 #include "cache.h"
 #include "builtin.h"
 #include "dir.h"
+#include "exec_cmd.h"
 #include "cache-tree.h"
 
 static const char builtin_add_usage[] =
-"git-add [-n] [-v] <filepattern>...";
+"git-add [-n] [-v] [-f] [--interactive | -i] [--] <filepattern>...";
 
 static void prune_directory(struct dir_struct *dir, const char **pathspec, int prefix)
 {
@@ -27,11 +26,9 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p
        i = dir->nr;
        while (--i >= 0) {
                struct dir_entry *entry = *src++;
-               if (!match_pathspec(pathspec, entry->name, entry->len, prefix, seen)) {
-                       free(entry);
-                       continue;
-               }
-               *dst++ = entry;
+               if (match_pathspec(pathspec, entry->name, entry->len,
+                                  prefix, seen))
+                       *dst++ = entry;
        }
        dir->nr = dst - dir->entries;
 
@@ -41,10 +38,20 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p
                if (seen[i])
                        continue;
 
-               /* Existing file? We must have ignored it */
                match = pathspec[i];
-               if (!match[0] || !lstat(match, &st))
+               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);
        }
 }
@@ -70,7 +77,6 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec)
        base = "";
        if (baselen) {
                char *common = xmalloc(baselen + 1);
-               common = xmalloc(baselen + 1);
                memcpy(common, *pathspec, baselen);
                common[baselen] = 0;
                path = base = common;
@@ -84,22 +90,34 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec)
 
 static struct lock_file lock_file;
 
-int cmd_add(int argc, const char **argv, char **envp)
+static const char ignore_warning[] =
+"The following paths are ignored by one of your .gitignore files:\n";
+
+int cmd_add(int argc, const char **argv, const char *prefix)
 {
        int i, newfd;
-       int verbose = 0, show_only = 0;
-       const char *prefix = setup_git_directory();
+       int verbose = 0, show_only = 0, ignored_too = 0;
        const char **pathspec;
        struct dir_struct dir;
+       int add_interactive = 0;
 
-       git_config(git_default_config);
+       for (i = 1; i < argc; i++) {
+               if (!strcmp("--interactive", argv[i]) ||
+                   !strcmp("-i", argv[i]))
+                       add_interactive++;
+       }
+       if (add_interactive) {
+               const char *args[] = { "add--interactive", NULL };
+
+               if (add_interactive != 1 || argc != 2)
+                       die("add --interactive does not take any parameters");
+               execv_git_cmd(args);
+               exit(1);
+       }
 
-       newfd = hold_lock_file_for_update(&lock_file, get_index_file());
-       if (newfd < 0)
-               die("unable to create new index file");
+       git_config(git_default_config);
 
-       if (read_cache() < 0)
-               die("index file corrupt");
+       newfd = hold_lock_file_for_update(&lock_file, get_index_file(), 1);
 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
@@ -114,11 +132,20 @@ int cmd_add(int argc, const char **argv, char **envp)
                        show_only = 1;
                        continue;
                }
+               if (!strcmp(arg, "-f")) {
+                       ignored_too = 1;
+                       continue;
+               }
                if (!strcmp(arg, "-v")) {
                        verbose = 1;
                        continue;
                }
-               die(builtin_add_usage);
+               usage(builtin_add_usage);
+       }
+       if (argc <= i) {
+               fprintf(stderr, "Nothing specified, nothing added.\n");
+               fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
+               return 0;
        }
        pathspec = get_pathspec(prefix, argv + i);
 
@@ -127,6 +154,8 @@ int cmd_add(int argc, const char **argv, char **envp)
        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";
@@ -135,6 +164,30 @@ int cmd_add(int argc, const char **argv, char **envp)
                return 0;
        }
 
+       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);
+               }
+       }
+
        for (i = 0; i < dir.nr; i++)
                add_file_to_index(dir.entries[i]->name, verbose);