Merge branch 'np/pack'

diff --git a/builtin-add.c b/builtin-add.c
index 1834e2d7cd50ec7688ec6c5c7d2c79c8513ed132..7c874e31154a4c3f96b3403db1bdcb0b36fdec3e 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -118,6 +118,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;
 }
 
@@ -245,7 +255,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 (read_cache() < 0)
                die("index file corrupt");