mirror of
https://github.com/git/git.git
synced 2024-12-15 04:46:02 +08:00
96099726dd
Every %(describe) placeholder in $Format:...$ strings in files with the attribute export-subst is expanded by calling git describe. This can potentially result in a lot of such calls per archive. That's OK for local repositories under control of the user of git archive, but could be a problem for hosted repositories. Expand only a single %(describe) placeholder per archive for now to avoid denial-of-service attacks. We can make this limit configurable later if needed, but let's start out simple. Reported-by: Jeff King <peff@peff.net> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
146 lines
4.9 KiB
Bash
Executable File
146 lines
4.9 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git archive attribute tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
SUBSTFORMAT='%H (%h)%n'
|
|
|
|
test_expect_exists() {
|
|
test_expect_${2:-success} " $1 exists" "test -e $1"
|
|
}
|
|
|
|
test_expect_missing() {
|
|
test_expect_${2:-success} " $1 does not exist" "test ! -e $1"
|
|
}
|
|
|
|
extract_tar_to_dir () {
|
|
(mkdir "$1" && cd "$1" && "$TAR" xf -) <"$1.tar"
|
|
}
|
|
|
|
test_expect_success 'setup' '
|
|
echo ignored >ignored &&
|
|
echo ignored export-ignore >>.git/info/attributes &&
|
|
git add ignored &&
|
|
|
|
echo ignored by tree >ignored-by-tree &&
|
|
echo ignored-by-tree export-ignore >.gitattributes &&
|
|
mkdir ignored-by-tree.d &&
|
|
>ignored-by-tree.d/file &&
|
|
echo ignored-by-tree.d export-ignore >>.gitattributes &&
|
|
git add ignored-by-tree ignored-by-tree.d .gitattributes &&
|
|
|
|
echo ignored by worktree >ignored-by-worktree &&
|
|
echo ignored-by-worktree export-ignore >.gitattributes &&
|
|
git add ignored-by-worktree &&
|
|
|
|
mkdir excluded-by-pathspec.d &&
|
|
>excluded-by-pathspec.d/file &&
|
|
git add excluded-by-pathspec.d &&
|
|
|
|
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >nosubstfile &&
|
|
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >substfile1 &&
|
|
printf "A not substituted O" >substfile2 &&
|
|
echo "substfile?" export-subst >>.git/info/attributes &&
|
|
git add nosubstfile substfile1 substfile2 &&
|
|
|
|
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/ignored-by-tree
|
|
test_expect_missing archive/ignored-by-tree.d
|
|
test_expect_missing archive/ignored-by-tree.d/file
|
|
test_expect_exists archive/ignored-by-worktree
|
|
test_expect_exists archive/excluded-by-pathspec.d
|
|
test_expect_exists archive/excluded-by-pathspec.d/file
|
|
|
|
test_expect_success 'git archive with pathspec' '
|
|
git archive HEAD ":!excluded-by-pathspec.d" >archive-pathspec.tar &&
|
|
extract_tar_to_dir archive-pathspec
|
|
'
|
|
|
|
test_expect_missing archive-pathspec/ignored
|
|
test_expect_missing archive-pathspec/ignored-by-tree
|
|
test_expect_missing archive-pathspec/ignored-by-tree.d
|
|
test_expect_missing archive-pathspec/ignored-by-tree.d/file
|
|
test_expect_exists archive-pathspec/ignored-by-worktree
|
|
test_expect_missing archive-pathspec/excluded-by-pathspec.d
|
|
test_expect_missing archive-pathspec/excluded-by-pathspec.d/file
|
|
|
|
test_expect_success 'git archive with wildcard pathspec' '
|
|
git archive HEAD ":!excluded-by-p*" >archive-pathspec-wildcard.tar &&
|
|
extract_tar_to_dir archive-pathspec-wildcard
|
|
'
|
|
|
|
test_expect_missing archive-pathspec-wildcard/ignored
|
|
test_expect_missing archive-pathspec-wildcard/ignored-by-tree
|
|
test_expect_missing archive-pathspec-wildcard/ignored-by-tree.d
|
|
test_expect_missing archive-pathspec-wildcard/ignored-by-tree.d/file
|
|
test_expect_exists archive-pathspec-wildcard/ignored-by-worktree
|
|
test_expect_missing archive-pathspec-wildcard/excluded-by-pathspec.d
|
|
test_expect_missing archive-pathspec-wildcard/excluded-by-pathspec.d/file
|
|
|
|
test_expect_success 'git archive with worktree attributes' '
|
|
git archive --worktree-attributes HEAD >worktree.tar &&
|
|
(mkdir worktree && cd worktree && "$TAR" xf -) <worktree.tar
|
|
'
|
|
|
|
test_expect_missing worktree/ignored
|
|
test_expect_exists worktree/ignored-by-tree
|
|
test_expect_missing worktree/ignored-by-worktree
|
|
|
|
test_expect_success 'git archive --worktree-attributes option' '
|
|
git archive --worktree-attributes --worktree-attributes HEAD >worktree.tar &&
|
|
(mkdir worktree2 && cd worktree2 && "$TAR" xf -) <worktree.tar
|
|
'
|
|
|
|
test_expect_missing worktree2/ignored
|
|
test_expect_exists worktree2/ignored-by-tree
|
|
test_expect_missing worktree2/ignored-by-worktree
|
|
|
|
test_expect_success 'git archive vs. bare' '
|
|
(cd bare && git archive HEAD) >bare-archive.tar &&
|
|
test_cmp_bin archive.tar bare-archive.tar
|
|
'
|
|
|
|
test_expect_success 'git archive with worktree attributes, bare' '
|
|
(cd bare && git archive --worktree-attributes HEAD) >bare-worktree.tar &&
|
|
(mkdir bare-worktree && cd bare-worktree && "$TAR" xf -) <bare-worktree.tar
|
|
'
|
|
|
|
test_expect_missing bare-worktree/ignored
|
|
test_expect_exists bare-worktree/ignored-by-tree
|
|
test_expect_exists bare-worktree/ignored-by-worktree
|
|
|
|
test_expect_success 'export-subst' '
|
|
git log "--pretty=format:A${SUBSTFORMAT}O" HEAD >substfile1.expected &&
|
|
test_cmp nosubstfile archive/nosubstfile &&
|
|
test_cmp substfile1.expected archive/substfile1 &&
|
|
test_cmp substfile2 archive/substfile2
|
|
'
|
|
|
|
test_expect_success 'export-subst expands %(describe) once' '
|
|
echo "\$Format:%(describe)\$" >substfile3 &&
|
|
echo "\$Format:%(describe)\$" >>substfile3 &&
|
|
echo "\$Format:%(describe)${LF}%(describe)\$" >substfile4 &&
|
|
git add substfile[34] &&
|
|
git commit -m export-subst-describe &&
|
|
git tag -m export-subst-describe export-subst-describe &&
|
|
git archive HEAD >archive-describe.tar &&
|
|
extract_tar_to_dir archive-describe &&
|
|
desc=$(git describe) &&
|
|
grep -F "$desc" archive-describe/substfile[34] >substituted &&
|
|
test_line_count = 1 substituted
|
|
'
|
|
|
|
test_done
|