mirror of
https://github.com/git/git
synced 2024-09-13 13:24:41 +00:00
aae2ae4f74
Commit 722ff7f87 (receive-pack: quarantine objects until
pre-receive accepts, 2016-10-03) regressed pushes to
repositories with colon (or semi-colon in Windows in them)
because it adds the repository's main object directory to
GIT_ALTERNATE_OBJECT_DIRECTORIES. The receiver interprets
the colon as a delimiter, not as part of the path, and
index-pack is unable to find objects which it needs to
resolve deltas.
The previous commit introduced a quoting mechanism for the
alternates list; let's use it here to cover this case. We'll
avoid quoting when we can, though. This alternate setup is
also used when calling hooks, so it's possible that the user
may call older git implementations which don't understand
the quoting mechanism. By quoting only when necessary, this
setup will continue to work unless the user _also_ has a
repository whose path contains the delimiter.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
56 lines
1.5 KiB
Bash
Executable file
56 lines
1.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='check quarantine of objects during push'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'create picky dest repo' '
|
|
git init --bare dest.git &&
|
|
write_script dest.git/hooks/pre-receive <<-\EOF
|
|
while read old new ref; do
|
|
test "$(git log -1 --format=%s $new)" = reject && exit 1
|
|
done
|
|
exit 0
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'accepted objects work' '
|
|
test_commit ok &&
|
|
git push dest.git HEAD &&
|
|
commit=$(git rev-parse HEAD) &&
|
|
git --git-dir=dest.git cat-file commit $commit
|
|
'
|
|
|
|
test_expect_success 'rejected objects are not installed' '
|
|
test_commit reject &&
|
|
commit=$(git rev-parse HEAD) &&
|
|
test_must_fail git push dest.git reject &&
|
|
test_must_fail git --git-dir=dest.git cat-file commit $commit
|
|
'
|
|
|
|
test_expect_success 'rejected objects are removed' '
|
|
echo "incoming-*" >expect &&
|
|
(cd dest.git/objects && echo incoming-*) >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# MINGW does not allow colons in pathnames in the first place
|
|
test_expect_success !MINGW 'push to repo path with colon' '
|
|
# The interesting failure case here is when the
|
|
# receiving end cannot access its original object directory,
|
|
# so make it likely for us to generate a delta by having
|
|
# a non-trivial file with multiple versions.
|
|
|
|
test-genrandom foo 4096 >file.bin &&
|
|
git add file.bin &&
|
|
git commit -m bin &&
|
|
git clone --bare . xxx:yyy.git &&
|
|
|
|
echo change >>file.bin &&
|
|
git commit -am change &&
|
|
# Note that we have to use the full path here, or it gets confused
|
|
# with the ssh host:path syntax.
|
|
git push "$PWD/xxx:yyy.git" HEAD
|
|
'
|
|
|
|
test_done
|