Extend "checkout --track" DWIM to support more cases

diff --git a/builtin-add.c b/builtin-add.c
index 6f5672a6161e9fb1ad8db044e1c318f7594e9e10..81b64d7b9d69f06fff70870e8a55fc4ad506133e 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -140,7 +140,8 @@ static void refresh(int verbose, const char **pathspec)
        for (specs = 0; pathspec[specs];  specs++)
                /* nothing */;
        seen = xcalloc(specs, 1);
-       refresh_index(&the_index, verbose ? 0 : REFRESH_QUIET, pathspec, seen);
+       refresh_index(&the_index, verbose ? REFRESH_SAY_CHANGED : REFRESH_QUIET,
+                     pathspec, seen);
        for (i = 0; i < specs; i++) {
                if (!seen[i])
                        die("pathspec '%s' did not match any files", pathspec[i]);
@@ -152,6 +153,16 @@ static const char **validate_pathspec(int argc, const char **argv, const char *p
 {
        const char **pathspec = get_pathspec(prefix, argv);
 
+       if (pathspec) {
+               const char **p;
+               for (p = pathspec; *p; p++) {
+                       if (has_symlink_leading_path(strlen(*p), *p)) {
+                               int len = prefix ? strlen(prefix) : 0;
+                               die("'%s' is beyond a symbolic link", *p + len);
+                       }
+               }
+       }
+
        return pathspec;
 }
 
@@ -277,7 +288,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
                fprintf(stderr, "Maybe you wanted to say 'git add .'?\n");
                return 0;
        }
-       pathspec = get_pathspec(prefix, argv);
+       pathspec = validate_pathspec(argc, argv, prefix);
 
        /*
         * If we are adding new files, we need to scan the working