global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-11 09:20:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ja/directory-attrs'

Browse Source 
The attribute mechanism didn't allow limiting attributes to be
applied to only a single directory itself with "path/" like the
exclude mechanism does.

* ja/directory-attrs:
  Add directory pattern matching to attributes
This commit is contained in:
Junio C Hamano
2013-01-05 23:41:46 -08:00
parent 3a3100a889 94bc671a1f
commit f7b3652bc9
3 changed files with 76 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
t/t5002-archive-attr-pattern.sh Executable file
View File

@@ -0,0 +1,57 @@
#!/bin/sh
test_description='git archive attribute pattern tests'
. ./test-lib.sh
test_expect_exists() {
test_expect_success " $1 exists" "test -e $1"
}
test_expect_missing() {
test_expect_success " $1 does not exist" "test ! -e $1"
}
test_expect_success 'setup' '
echo ignored >ignored &&
echo ignored export-ignore >>.git/info/attributes &&
git add ignored &&
mkdir not-ignored-dir &&
echo ignored-in-tree >not-ignored-dir/ignored &&
echo not-ignored-in-tree >not-ignored-dir/ignored-only-if-dir &&
git add not-ignored-dir &&
mkdir ignored-only-if-dir &&
echo ignored by ignored dir >ignored-only-if-dir/ignored-by-ignored-dir &&
echo ignored-only-if-dir/ export-ignore >>.git/info/attributes &&
git add ignored-only-if-dir &&
mkdir -p one-level-lower/two-levels-lower/ignored-only-if-dir &&
echo ignored by ignored dir >one-level-lower/two-levels-lower/ignored-only-if-dir/ignored-by-ignored-dir &&
git add one-level-lower &&
git commit -m. &&
git clone --bare . bare &&
cp .git/info/attributes bare/info/attributes
'
test_expect_success 'git archive' '
git archive HEAD >archive.tar &&
(mkdir archive && cd archive && "$TAR" xf -) <archive.tar
'
test_expect_missing archive/ignored
test_expect_missing archive/not-ignored-dir/ignored
test_expect_exists archive/not-ignored-dir/ignored-only-if-dir
test_expect_exists archive/not-ignored-dir/
test_expect_missing archive/ignored-only-if-dir/
test_expect_missing archive/ignored-ony-if-dir/ignored-by-ignored-dir
test_expect_exists archive/one-level-lower/
test_expect_missing archive/one-level-lower/two-levels-lower/ignored-only-if-dir/
test_expect_missing archive/one-level-lower/two-levels-lower/ignored-ony-if-dir/ignored-by-ignored-dir
test_done