undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-add: adjust to the get_pathspec() changes.

Browse Source 
We would need to notice and fail if command line had a nonsense pathspec.
Earlier get_pathspec() returned all the inputs including bad ones, but
the new one issues warnings and removes offending ones from its return
value, so the callers need to be adjusted to notice it.

Additional test scripts were initially from Robin Rosenberg, further fixed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-02-01 03:13:10 -08:00
parent 097971f5f5
commit 1abf095063
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin-add.c
View File

@ -228,6 +228,18 @@ int cmd_add(int argc, const char **argv, const char *prefix)
goto finish;
}
if (*argv) {
/* Was there an invalid path? */
if (pathspec) {
int num;
for (num = 0; pathspec[num]; num++)
; /* just counting */
if (argc != num)
exit(1); /* error message already given */
} else
exit(1); /* error message already given */
}
fill_directory(&dir, pathspec, ignored_too);
if (show_only) {

47
t/t7010-setup.sh
View File

@ -114,4 +114,51 @@ test_expect_success 'git ls-files (relative #3)' '
'
test_expect_success 'commit using absolute path names' '
git commit -m "foo" &&
echo aa >>a/b/c/d &&
git commit -m "aa" "$(pwd)/a/b/c/d"
'
test_expect_success 'log using absolute path names' '
echo bb >>a/b/c/d &&
git commit -m "bb" $(pwd)/a/b/c/d &&
git log a/b/c/d >f1.txt &&
git log "$(pwd)/a/b/c/d" >f2.txt &&
diff -u f1.txt f2.txt
'
test_expect_success 'blame using absolute path names' '
git blame a/b/c/d >f1.txt &&
git blame "$(pwd)/a/b/c/d" >f2.txt &&
diff -u f1.txt f2.txt
'
test_expect_success 'setup deeper work tree' '
test_create_repo tester
'
test_expect_success 'add a directory outside the work tree' '(
cd tester &&
d1="$(cd .. ; pwd)" &&
git add "$d1"
)'
test_expect_success 'add a file outside the work tree, nasty case 1' '(
cd tester &&
f="$(pwd)x" &&
echo "$f" &&
touch "$f" &&
git add "$f"
)'
test_expect_success 'add a file outside the work tree, nasty case 2' '(
cd tester &&
f="$(pwd | sed "s/.$//")x" &&
echo "$f" &&
touch "$f" &&
git add "$f"
)'
test_done