2009-04-17 22:18:10 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='git archive attribute tests'
|
|
|
|
|
|
2022-06-03 11:15:06 +00:00
|
|
|
TEST_CREATE_REPO_NO_TEMPLATE=1
|
2023-02-06 23:07:40 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2009-04-17 22:18:10 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
2010-07-27 18:32:36 +00:00
|
|
|
SUBSTFORMAT='%H (%h)%n'
|
2009-04-17 22:18:10 +00:00
|
|
|
|
|
|
|
|
test_expect_exists() {
|
2017-08-19 05:28:54 +00:00
|
|
|
test_expect_${2:-success} " $1 exists" "test -e $1"
|
2009-04-17 22:18:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_missing() {
|
2017-08-19 05:28:54 +00:00
|
|
|
test_expect_${2:-success} " $1 does not exist" "test ! -e $1"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
extract_tar_to_dir () {
|
|
|
|
|
(mkdir "$1" && cd "$1" && "$TAR" xf -) <"$1.tar"
|
2009-04-17 22:18:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
|
echo ignored >ignored &&
|
2022-06-03 11:15:06 +00:00
|
|
|
mkdir .git/info &&
|
2009-04-17 22:18:10 +00:00
|
|
|
echo ignored export-ignore >>.git/info/attributes &&
|
|
|
|
|
git add ignored &&
|
|
|
|
|
|
|
|
|
|
echo ignored by tree >ignored-by-tree &&
|
|
|
|
|
echo ignored-by-tree export-ignore >.gitattributes &&
|
2017-08-19 05:28:54 +00:00
|
|
|
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 &&
|
2009-04-17 22:18:10 +00:00
|
|
|
|
2023-03-24 22:27:11 +00:00
|
|
|
mkdir subdir &&
|
|
|
|
|
>subdir/included &&
|
|
|
|
|
>subdir/ignored-by-subtree &&
|
|
|
|
|
>subdir/ignored-by-tree &&
|
|
|
|
|
echo ignored-by-subtree export-ignore >subdir/.gitattributes &&
|
|
|
|
|
git add subdir &&
|
|
|
|
|
|
2009-04-17 22:18:10 +00:00
|
|
|
echo ignored by worktree >ignored-by-worktree &&
|
|
|
|
|
echo ignored-by-worktree export-ignore >.gitattributes &&
|
|
|
|
|
git add ignored-by-worktree &&
|
|
|
|
|
|
2017-08-19 05:28:54 +00:00
|
|
|
mkdir excluded-by-pathspec.d &&
|
|
|
|
|
>excluded-by-pathspec.d/file &&
|
|
|
|
|
git add excluded-by-pathspec.d &&
|
|
|
|
|
|
2009-04-17 22:18:10 +00:00
|
|
|
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. &&
|
|
|
|
|
|
2022-06-03 11:15:06 +00:00
|
|
|
git clone --template= --bare . bare &&
|
|
|
|
|
mkdir bare/info &&
|
2009-04-17 22:18:10 +00:00
|
|
|
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
|
2017-08-19 05:28:54 +00:00
|
|
|
test_expect_missing archive/ignored-by-tree.d
|
|
|
|
|
test_expect_missing archive/ignored-by-tree.d/file
|
2009-04-17 22:18:10 +00:00
|
|
|
test_expect_exists archive/ignored-by-worktree
|
2017-08-19 05:28:54 +00:00
|
|
|
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
|
2017-09-12 22:43:57 +00:00
|
|
|
test_expect_missing archive-pathspec/excluded-by-pathspec.d
|
2017-08-19 05:28:54 +00:00
|
|
|
test_expect_missing archive-pathspec/excluded-by-pathspec.d/file
|
|
|
|
|
|
2017-08-19 05:32:37 +00:00
|
|
|
test_expect_success 'git archive with wildcard pathspec' '
|
2017-08-19 05:28:54 +00:00
|
|
|
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
|
2017-08-19 05:32:37 +00:00
|
|
|
test_expect_exists archive-pathspec-wildcard/ignored-by-worktree
|
2017-08-19 05:28:54 +00:00
|
|
|
test_expect_missing archive-pathspec-wildcard/excluded-by-pathspec.d
|
|
|
|
|
test_expect_missing archive-pathspec-wildcard/excluded-by-pathspec.d/file
|
2009-04-17 22:18:10 +00:00
|
|
|
|
2023-03-24 22:27:11 +00:00
|
|
|
test_expect_success 'git -C subdir archive' '
|
|
|
|
|
git -C subdir archive HEAD >archive-subdir.tar &&
|
|
|
|
|
extract_tar_to_dir archive-subdir
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_exists archive-subdir/included
|
|
|
|
|
test_expect_missing archive-subdir/ignored-by-subtree
|
|
|
|
|
test_expect_missing archive-subdir/ignored-by-tree
|
|
|
|
|
|
2009-04-17 22:18:10 +00:00
|
|
|
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
|
|
|
|
|
|
2011-09-27 23:59:01 +00:00
|
|
|
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
|
|
|
|
|
|
2009-04-17 22:18:10 +00:00
|
|
|
test_expect_success 'git archive vs. bare' '
|
|
|
|
|
(cd bare && git archive HEAD) >bare-archive.tar &&
|
2014-06-04 15:57:52 +00:00
|
|
|
test_cmp_bin archive.tar bare-archive.tar
|
2009-04-17 22:18:10 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git archive with worktree attributes, bare' '
|
stop using HEAD for attributes in bare repository by default
With 23865355 (attr: read attributes from HEAD when bare repo,
2023-10-13), we started to use the HEAD tree as the default
attribute source in a bare repository. One argument for such a
behaviour is that it would make things like "git archive" run in
bare and non-bare repositories for the same commit consistent.
This changes was merged to Git 2.43 but without an explicit mention
in its release notes.
It turns out that this change destroys performance of shallowly
cloning from a bare repository. As the "server" installations are
expected to be mostly bare, and "git pack-objects", which is the
core of driving the other side of "git clone" and "git fetch" wants
to see if a path is set not to delta with blobs from other paths via
the attribute system, the change forces the server side to traverse
the tree of the HEAD commit needlessly to find if each and every
paths the objects it sends out has the attribute that controls the
deltification. Given that (1) most projects do not configure such
an attribute, and (2) it is dubious for the server side to honor
such an end-user supplied attribute anyway, this was a poor choice
of the default.
To mitigate the current situation, let's revert the change that uses
the tree of HEAD in a bare repository by default as the attribute
source. This will help most people who have been happy with the
behaviour of Git 2.42 and before.
Two things to note:
* If you are stuck with versions of Git 2.43 or newer, that is
older than the release this fix appears in, you can explicitly
set the attr.tree configuration variable to point at an empty
tree object, i.e.
$ git config attr.tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
* If you like the behaviour we are reverting, you can explicitly
set the attr.tree configuration variable to HEAD, i.e.
$ git config attr.tree HEAD
The right fix for this is to optimize the code paths that allow
accesses to attributes in tree objects, but that is a much more
involved change and is left as a longer-term project, outside the
scope of this "first step" fix.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-05-03 15:34:27 +00:00
|
|
|
(cd bare &&
|
|
|
|
|
git -c attr.tree=HEAD archive --worktree-attributes HEAD) >bare-worktree.tar &&
|
2009-04-17 22:18:10 +00:00
|
|
|
(mkdir bare-worktree && cd bare-worktree && "$TAR" xf -) <bare-worktree.tar
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_missing bare-worktree/ignored
|
2023-10-13 17:39:29 +00:00
|
|
|
test_expect_missing bare-worktree/ignored-by-tree
|
2009-04-17 22:18:10 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2021-02-28 11:22:47 +00:00
|
|
|
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
|
|
|
|
|
'
|
|
|
|
|
|
2009-04-17 22:18:10 +00:00
|
|
|
test_done
|