2005-07-25 06:26:09 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
2007-07-03 13:52:14 +08:00
|
|
|
test_description='git ls-files --others --exclude
|
2005-07-25 06:26:09 +08:00
|
|
|
|
2007-07-03 13:52:14 +08:00
|
|
|
This test runs git ls-files --others and tests --exclude patterns.
|
2005-07-25 06:26:09 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
rm -fr one three
|
|
|
|
for dir in . one one/two three
|
|
|
|
do
|
|
|
|
mkdir -p $dir &&
|
2005-07-29 14:53:29 +08:00
|
|
|
for i in 1 2 3 4 5 6 7 8
|
2005-07-25 06:26:09 +08:00
|
|
|
do
|
|
|
|
>$dir/a.$i
|
|
|
|
done
|
|
|
|
done
|
|
|
|
|
|
|
|
cat >expect <<EOF
|
|
|
|
a.2
|
|
|
|
a.4
|
|
|
|
a.5
|
2005-07-29 14:53:29 +08:00
|
|
|
a.8
|
2005-07-25 06:26:09 +08:00
|
|
|
one/a.3
|
|
|
|
one/a.4
|
|
|
|
one/a.5
|
2005-07-29 14:53:29 +08:00
|
|
|
one/a.7
|
|
|
|
one/two/a.2
|
2005-07-25 06:26:09 +08:00
|
|
|
one/two/a.3
|
|
|
|
one/two/a.5
|
2005-07-29 14:53:29 +08:00
|
|
|
one/two/a.7
|
|
|
|
one/two/a.8
|
2005-07-25 06:26:09 +08:00
|
|
|
three/a.2
|
|
|
|
three/a.3
|
|
|
|
three/a.4
|
|
|
|
three/a.5
|
2005-07-29 14:53:29 +08:00
|
|
|
three/a.8
|
2005-07-25 06:26:09 +08:00
|
|
|
EOF
|
|
|
|
|
|
|
|
echo '.gitignore
|
|
|
|
output
|
|
|
|
expect
|
|
|
|
.gitignore
|
2005-07-29 14:53:29 +08:00
|
|
|
*.7
|
|
|
|
!*.8' >.git/ignore
|
2005-07-25 06:26:09 +08:00
|
|
|
|
|
|
|
echo '*.1
|
2005-07-29 14:53:29 +08:00
|
|
|
/*.3
|
|
|
|
!*.6' >.gitignore
|
2005-07-25 06:26:09 +08:00
|
|
|
echo '*.2
|
2005-07-29 14:53:29 +08:00
|
|
|
two/*.4
|
|
|
|
!*.7
|
|
|
|
*.8' >one/.gitignore
|
|
|
|
echo '!*.2
|
|
|
|
!*.8' >one/two/.gitignore
|
2005-07-25 06:26:09 +08:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 13:52:14 +08:00
|
|
|
'git ls-files --others with various exclude options.' \
|
|
|
|
'git ls-files --others \
|
2005-07-29 14:53:29 +08:00
|
|
|
--exclude=\*.6 \
|
2005-07-25 06:26:09 +08:00
|
|
|
--exclude-per-directory=.gitignore \
|
|
|
|
--exclude-from=.git/ignore \
|
|
|
|
>output &&
|
2008-05-24 13:28:56 +08:00
|
|
|
test_cmp expect output'
|
2005-08-11 10:15:02 +08:00
|
|
|
|
2005-11-02 21:05:45 +08:00
|
|
|
# Test \r\n (MSDOS-like systems)
|
2006-02-13 02:05:34 +08:00
|
|
|
printf '*.1\r\n/*.3\r\n!*.6\r\n' >.gitignore
|
2005-11-02 21:05:45 +08:00
|
|
|
|
|
|
|
test_expect_success \
|
2007-07-03 13:52:14 +08:00
|
|
|
'git ls-files --others with \r\n line endings.' \
|
|
|
|
'git ls-files --others \
|
2005-11-02 21:05:45 +08:00
|
|
|
--exclude=\*.6 \
|
|
|
|
--exclude-per-directory=.gitignore \
|
|
|
|
--exclude-from=.git/ignore \
|
|
|
|
>output &&
|
2008-05-24 13:28:56 +08:00
|
|
|
test_cmp expect output'
|
2005-11-02 21:05:45 +08:00
|
|
|
|
2007-05-22 08:12:17 +08:00
|
|
|
cat > excludes-file << EOF
|
|
|
|
*.[1-8]
|
|
|
|
e*
|
|
|
|
EOF
|
|
|
|
|
2007-07-03 13:52:14 +08:00
|
|
|
git config core.excludesFile excludes-file
|
2007-05-22 08:12:17 +08:00
|
|
|
|
2007-11-15 14:27:57 +08:00
|
|
|
git status | grep "^# " > output
|
2007-05-22 08:12:17 +08:00
|
|
|
|
|
|
|
cat > expect << EOF
|
|
|
|
# .gitignore
|
|
|
|
# a.6
|
|
|
|
# one/
|
|
|
|
# output
|
|
|
|
# three/
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'git-status honours core.excludesfile' \
|
2008-03-13 05:36:36 +08:00
|
|
|
'test_cmp expect output'
|
2007-05-22 08:12:17 +08:00
|
|
|
|
2008-01-31 17:17:48 +08:00
|
|
|
test_expect_success 'trailing slash in exclude allows directory match(1)' '
|
|
|
|
|
|
|
|
git ls-files --others --exclude=one/ >output &&
|
|
|
|
if grep "^one/" output
|
|
|
|
then
|
|
|
|
echo Ooops
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'trailing slash in exclude allows directory match (2)' '
|
|
|
|
|
|
|
|
git ls-files --others --exclude=one/two/ >output &&
|
|
|
|
if grep "^one/two/" output
|
|
|
|
then
|
|
|
|
echo Ooops
|
|
|
|
false
|
|
|
|
else
|
|
|
|
: happy
|
|
|
|
fi
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'trailing slash in exclude forces directory match (1)' '
|
|
|
|
|
|
|
|
>two
|
|
|
|
git ls-files --others --exclude=two/ >output &&
|
|
|
|
grep "^two" output
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'trailing slash in exclude forces directory match (2)' '
|
|
|
|
|
|
|
|
git ls-files --others --exclude=one/a.1/ >output &&
|
|
|
|
grep "^one/a.1" output
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2005-08-11 10:15:02 +08:00
|
|
|
test_done
|