mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
efa5f82540
Prior to v1.8.1.1, with: git init echo content >foo && mkdir subdir && echo content >subdir/bar && echo "subdir export-ignore" >.gitattributes git add . && git commit -m one && git archive HEAD | tar tf - the resulting archive would contain only "foo" and ".gitattributes", not subdir. This was broken with a recent change that intended to allow "subdir/ export-ignore" to also exclude the directory, but instead ended up _requiring_ the trailing slash by mistake. A pattern "subdir" should match any path "subdir", whether it is a directory or a non-directory. A pattern "subdir/" insists that a path "subdir" must be a directory for it to match. This patch adds test not just for this simple case, but also for deeper cross-directory cases, as well as cases with wildcards. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
84 lines
2.9 KiB
Bash
Executable file
84 lines
2.9 KiB
Bash
Executable file
#!/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 ignored-without-slash &&
|
|
echo "ignored without slash" >ignored-without-slash/foo &&
|
|
git add ignored-without-slash/foo &&
|
|
echo "ignored-without-slash export-ignore" >>.git/info/attributes &&
|
|
|
|
mkdir -p wildcard-without-slash &&
|
|
echo "ignored without slash" >wildcard-without-slash/foo &&
|
|
git add wildcard-without-slash/foo &&
|
|
echo "wild*-without-slash export-ignore" >>.git/info/attributes &&
|
|
|
|
mkdir -p deep/and/slashless &&
|
|
echo "ignored without slash" >deep/and/slashless/foo &&
|
|
git add deep/and/slashless/foo &&
|
|
echo "deep/and/slashless export-ignore" >>.git/info/attributes &&
|
|
|
|
mkdir -p deep/with/wildcard &&
|
|
echo "ignored without slash" >deep/with/wildcard/foo &&
|
|
git add deep/with/wildcard/foo &&
|
|
echo "deep/*t*/wildcard export-ignore" >>.git/info/attributes &&
|
|
|
|
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_missing archive/ignored-without-slash/ &&
|
|
test_expect_missing archive/ignored-without-slash/foo &&
|
|
test_expect_missing archive/wildcard-without-slash/
|
|
test_expect_missing archive/wildcard-without-slash/foo &&
|
|
test_expect_missing archive/deep/and/slashless/ &&
|
|
test_expect_missing archive/deep/and/slashless/foo &&
|
|
test_expect_missing archive/deep/with/wildcard/ &&
|
|
test_expect_missing archive/deep/with/wildcard/foo &&
|
|
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
|