aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-04 00:52:37 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-04 23:31:23 -0700
commit725b06050a083474e240a2436121e0a80bb9f175 (patch)
tree3831874f7cce9b6307bcf3816525f66973878eba
parent806d13b1ccdbdde4bbdfb96902791c4b7ed125f6 (diff)
downloadgit-725b06050a083474e240a2436121e0a80bb9f175.tar.gz
git-725b06050a083474e240a2436121e0a80bb9f175.tar.xz
add: refuse to add working tree items beyond symlinks
This is the same fix for the issue of adding "sym/path" when "sym" is a symblic link that points at a directory "dir" with "path" in it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-add.c12
-rw-r--r--dir.c6
-rwxr-xr-xt/t0055-beyond-symlinks.sh7
3 files changed, 22 insertions, 3 deletions
diff --git a/builtin-add.c b/builtin-add.c
index fc3f96eae..81b64d7b9 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -153,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;
}
@@ -278,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
diff --git a/dir.c b/dir.c
index 29d1d5ba3..ae7046fd0 100644
--- a/dir.c
+++ b/dir.c
@@ -727,8 +727,12 @@ static void free_simplify(struct path_simplify *simplify)
int read_directory(struct dir_struct *dir, const char *path, const char *base, int baselen, const char **pathspec)
{
- struct path_simplify *simplify = create_simplify(pathspec);
+ struct path_simplify *simplify;
+ if (has_symlink_leading_path(strlen(path), path))
+ return dir->nr;
+
+ simplify = create_simplify(pathspec);
read_directory_recursive(dir, path, base, baselen, 0, simplify);
free_simplify(simplify);
qsort(dir->entries, dir->nr, sizeof(struct dir_entry *), cmp_name);
diff --git a/t/t0055-beyond-symlinks.sh b/t/t0055-beyond-symlinks.sh
index eb11dd782..b29c37a5a 100755
--- a/t/t0055-beyond-symlinks.sh
+++ b/t/t0055-beyond-symlinks.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='update-index refuses to add beyond symlinks'
+test_description='update-index and add refuse to add beyond symlinks'
. ./test-lib.sh
@@ -17,4 +17,9 @@ test_expect_success 'update-index --add beyond symlinks' '
! ( git ls-files | grep c/d )
'
+test_expect_success 'add beyond symlinks' '
+ test_must_fail git add c/d &&
+ ! ( git ls-files | grep c/d )
+'
+
test_done