mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
35039ced92
Given a file with: (define archive-id "$Format:%ct|%h|a$") and an export-subst attribute, the "%h" results in an full 40-digit object name instead of the expected 7-digit one. The export-subst feature requests unabbreviated object names because that is the low-level default. The effect was not observable until v1.7.1.1~17^2~3 (2010-05-03), which taught log --format=%h to respect the --abbrev option. Reported-by: Eli Barzilay <eli@barzilay.org> Tested-by: Eli Barzilay <eli@barzilay.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
91 lines
2.6 KiB
Bash
Executable file
91 lines
2.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git archive attribute tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
SUBSTFORMAT='%H (%h)%n'
|
|
|
|
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 &&
|
|
|
|
echo ignored by tree >ignored-by-tree &&
|
|
echo ignored-by-tree export-ignore >.gitattributes &&
|
|
git add ignored-by-tree .gitattributes &&
|
|
|
|
echo ignored by worktree >ignored-by-worktree &&
|
|
echo ignored-by-worktree export-ignore >.gitattributes &&
|
|
git add ignored-by-worktree &&
|
|
|
|
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_exists archive/ignored-by-worktree
|
|
|
|
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 vs. bare' '
|
|
(cd bare && git archive HEAD) >bare-archive.tar &&
|
|
test_cmp 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 'git tar-tree vs. git archive with worktree attributes' '
|
|
git tar-tree HEAD >tar-tree.tar &&
|
|
test_cmp worktree.tar tar-tree.tar
|
|
'
|
|
|
|
test_expect_success 'git tar-tree vs. git archive with worktree attrs, bare' '
|
|
(cd bare && git tar-tree HEAD) >bare-tar-tree.tar &&
|
|
test_cmp bare-worktree.tar bare-tar-tree.tar
|
|
'
|
|
|
|
test_done
|