-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tests for "git add ignored-dir/file" without -f
Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information
Junio C Hamano
committed
Mar 14, 2010
1 parent
29209cb
commit b75aea8
Showing
1 changed file
with
79 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
#!/bin/sh | ||
|
||
test_description='giving ignored paths to git add' | ||
|
||
. ./test-lib.sh | ||
|
||
test_expect_success setup ' | ||
mkdir sub dir dir/sub && | ||
echo sub >.gitignore && | ||
echo ign >>.gitignore && | ||
for p in . sub dir dir/sub | ||
do | ||
>"$p/ign" && | ||
>"$p/file" || exit 1 | ||
done | ||
' | ||
|
||
for i in file dir/file dir 'd*' | ||
do | ||
test_expect_success "no complaints for unignored $i" ' | ||
rm -f .git/index && | ||
git add "$i" && | ||
git ls-files "$i" >out && | ||
test -s out | ||
' | ||
done | ||
|
||
for i in ign dir/ign dir/sub dir/sub/*ign sub/file sub sub/* | ||
do | ||
test_expect_success "complaints for ignored $i" ' | ||
rm -f .git/index && | ||
test_must_fail git add "$i" 2>err && | ||
git ls-files "$i" >out && | ||
! test -s out && | ||
grep -e "Use -f if" err && | ||
cat err | ||
' | ||
|
||
test_expect_success "complaints for ignored $i with unignored file" ' | ||
rm -f .git/index && | ||
test_must_fail git add "$i" file 2>err && | ||
git ls-files "$i" >out && | ||
! test -s out && | ||
grep -e "Use -f if" err && | ||
cat err | ||
' | ||
done | ||
|
||
for i in sub sub/* | ||
do | ||
test_expect_success "complaints for ignored $i in dir" ' | ||
rm -f .git/index && | ||
( | ||
cd dir && | ||
test_must_fail git add "$i" 2>err && | ||
git ls-files "$i" >out && | ||
! test -s out && | ||
grep -e "Use -f if" err && | ||
cat err | ||
) | ||
' | ||
done | ||
|
||
for i in ign file | ||
do | ||
test_expect_success "complaints for ignored $i in sub" ' | ||
rm -f .git/index && | ||
( | ||
cd sub && | ||
test_must_fail git add "$i" 2>err && | ||
git ls-files "$i" >out && | ||
! test -s out && | ||
grep -e "Use -f if" err && | ||
cat err | ||
) | ||
' | ||
done | ||
|
||
test_done |