mirror of
https://github.com/git/git.git
synced 2024-05-22 22:36:09 +02:00
5c5b29b459
When we're enumerating all objects in the object database, it doesn't
make sense to respect refs/replace. The point of this option is to
enumerate all of the objects in the database at a low level. By
definition we'd already show the replacement object's contents (under
its real oid), and showing those contents under another oid is almost
certainly working against what the user is trying to do.
Note that you could make the same argument for something like:
git show-index <foo.idx |
awk '{print $2}' |
git cat-file --batch
but there we can't know in cat-file exactly what the user intended,
because we don't know the source of the input. They could be trying to
do low-level debugging, or they could be doing something more high-level
(e.g., imagine a porcelain built around cat-file for its object
accesses). So in those cases, we'll have to rely on the user specifying
"git --no-replace-objects" to tell us what to do.
One _could_ make an argument that "cat-file --batch" is sufficiently
low-level plumbing that it should not respect replace-objects at all
(and the caller should do any replacement if they want it). But we have
been doing so for some time. The history is a little tangled:
- looking back as far as v1.6.6, we would not respect replace refs for
--batch-check, but would for --batch (because the former used
sha1_object_info(), and the replace mechanism only affected actual
object reads)
- this discrepancy was made even weirder by 98e2092b50 (cat-file:
teach --batch to stream blob objects, 2013-07-10), where we always
output the header using the --batch-check code, and then printed the
object separately. This could lead to "cat-file --batch" dying (when
it notices the size or type changed for a non-blob object) or even
producing bogus output (in streaming mode, we didn't notice that we
wrote the wrong number of bytes).
- that persisted until 1f7117ef7a (sha1_file: perform object
replacement in sha1_object_info_extended(), 2013-12-11), which then
respected replace refs for both forms.
So it has worked reliably this way for over 7 years, and we should make
sure it continues to do so. That could also be an argument that
--batch-all-objects should not change behavior (which this patch is
doing), but I really consider the current behavior to be an unintended
bug. It's a side effect of how the code is implemented (feeding the oids
back into oid_object_info() rather than looking at what we found while
reading the loose and packed object storage).
The implementation is straight-forward: we just disable the global
read_replace_refs flag when we're in --batch-all-objects mode. It would
perhaps be a little cleaner to change the flag we pass to
oid_object_info_extended(), but that's not enough. We also read objects
via read_object_file() and stream_blob_to_fd(). The former could switch
to its _extended() form, but the streaming code has no mechanism for
disabling replace refs. Setting the global flag works, and as a bonus,
it's impossible to have any "oops, we're sometimes replacing the object
and sometimes not" bugs in the output (like the ones caused by
98e2092b50 above).
The tests here cover the regular-input and --batch-all-objects cases,
for both --batch-check and --batch. There is a test in t6050 that covers
the regular-input case with --batch already, but this new one goes much
further in actually verifying the output (plus covering --batch-check
explicitly). This is perhaps a little overkill and the tests would be
simpler just covering --batch-check, but I wanted to make sure we're
checking that --batch output is consistent between the header and the
content. The global-flag technique used here makes that easy to get
right, but this is future-proofing us against regressions.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
687 lines
22 KiB
Bash
Executable File
687 lines
22 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='git cat-file'
|
|
|
|
. ./test-lib.sh
|
|
|
|
echo_without_newline () {
|
|
printf '%s' "$*"
|
|
}
|
|
|
|
strlen () {
|
|
echo_without_newline "$1" | wc -c | sed -e 's/^ *//'
|
|
}
|
|
|
|
maybe_remove_timestamp () {
|
|
if test -z "$2"; then
|
|
echo_without_newline "$1"
|
|
else
|
|
echo_without_newline "$(printf '%s\n' "$1" | sed -e 's/ [0-9][0-9]* [-+][0-9][0-9][0-9][0-9]$//')"
|
|
fi
|
|
}
|
|
|
|
run_tests () {
|
|
type=$1
|
|
sha1=$2
|
|
size=$3
|
|
content=$4
|
|
pretty_content=$5
|
|
no_ts=$6
|
|
|
|
batch_output="$sha1 $type $size
|
|
$content"
|
|
|
|
test_expect_success "$type exists" '
|
|
git cat-file -e $sha1
|
|
'
|
|
|
|
test_expect_success "Type of $type is correct" '
|
|
echo $type >expect &&
|
|
git cat-file -t $sha1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "Size of $type is correct" '
|
|
echo $size >expect &&
|
|
git cat-file -s $sha1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "Type of $type is correct using --allow-unknown-type" '
|
|
echo $type >expect &&
|
|
git cat-file -t --allow-unknown-type $sha1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "Size of $type is correct using --allow-unknown-type" '
|
|
echo $size >expect &&
|
|
git cat-file -s --allow-unknown-type $sha1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test -z "$content" ||
|
|
test_expect_success "Content of $type is correct" '
|
|
maybe_remove_timestamp "$content" $no_ts >expect &&
|
|
maybe_remove_timestamp "$(git cat-file $type $sha1)" $no_ts >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "Pretty content of $type is correct" '
|
|
maybe_remove_timestamp "$pretty_content" $no_ts >expect &&
|
|
maybe_remove_timestamp "$(git cat-file -p $sha1)" $no_ts >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test -z "$content" ||
|
|
test_expect_success "--batch output of $type is correct" '
|
|
maybe_remove_timestamp "$batch_output" $no_ts >expect &&
|
|
maybe_remove_timestamp "$(echo $sha1 | git cat-file --batch)" $no_ts >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "--batch-check output of $type is correct" '
|
|
echo "$sha1 $type $size" >expect &&
|
|
echo_without_newline $sha1 | git cat-file --batch-check >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "custom --batch-check format" '
|
|
echo "$type $sha1" >expect &&
|
|
echo $sha1 | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '--batch-check with %(rest)' '
|
|
echo "$type this is some extra content" >expect &&
|
|
echo "$sha1 this is some extra content" |
|
|
git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test -z "$content" ||
|
|
test_expect_success "--batch without type ($type)" '
|
|
{
|
|
echo "$size" &&
|
|
maybe_remove_timestamp "$content" $no_ts
|
|
} >expect &&
|
|
echo $sha1 | git cat-file --batch="%(objectsize)" >actual.full &&
|
|
maybe_remove_timestamp "$(cat actual.full)" $no_ts >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test -z "$content" ||
|
|
test_expect_success "--batch without size ($type)" '
|
|
{
|
|
echo "$type" &&
|
|
maybe_remove_timestamp "$content" $no_ts
|
|
} >expect &&
|
|
echo $sha1 | git cat-file --batch="%(objecttype)" >actual.full &&
|
|
maybe_remove_timestamp "$(cat actual.full)" $no_ts >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
}
|
|
|
|
hello_content="Hello World"
|
|
hello_size=$(strlen "$hello_content")
|
|
hello_sha1=$(echo_without_newline "$hello_content" | git hash-object --stdin)
|
|
|
|
test_expect_success "setup" '
|
|
echo_without_newline "$hello_content" > hello &&
|
|
git update-index --add hello
|
|
'
|
|
|
|
run_tests 'blob' $hello_sha1 $hello_size "$hello_content" "$hello_content"
|
|
|
|
test_expect_success '--batch-check without %(rest) considers whole line' '
|
|
echo "$hello_sha1 blob $hello_size" >expect &&
|
|
git update-index --add --cacheinfo 100644 $hello_sha1 "white space" &&
|
|
test_when_finished "git update-index --remove \"white space\"" &&
|
|
echo ":white space" | git cat-file --batch-check >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
tree_sha1=$(git write-tree)
|
|
tree_size=$(($(test_oid rawsz) + 13))
|
|
tree_pretty_content="100644 blob $hello_sha1 hello"
|
|
|
|
run_tests 'tree' $tree_sha1 $tree_size "" "$tree_pretty_content"
|
|
|
|
commit_message="Initial commit"
|
|
commit_sha1=$(echo_without_newline "$commit_message" | git commit-tree $tree_sha1)
|
|
commit_size=$(($(test_oid hexsz) + 137))
|
|
commit_content="tree $tree_sha1
|
|
author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 0000000000 +0000
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 0000000000 +0000
|
|
|
|
$commit_message"
|
|
|
|
run_tests 'commit' $commit_sha1 $commit_size "$commit_content" "$commit_content" 1
|
|
|
|
tag_header_without_timestamp="object $hello_sha1
|
|
type blob
|
|
tag hellotag
|
|
tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
|
|
tag_description="This is a tag"
|
|
tag_content="$tag_header_without_timestamp 0000000000 +0000
|
|
|
|
$tag_description"
|
|
|
|
tag_sha1=$(echo_without_newline "$tag_content" | git hash-object -t tag --stdin -w)
|
|
tag_size=$(strlen "$tag_content")
|
|
|
|
run_tests 'tag' $tag_sha1 $tag_size "$tag_content" "$tag_content" 1
|
|
|
|
test_expect_success \
|
|
"Reach a blob from a tag pointing to it" \
|
|
"test '$hello_content' = \"\$(git cat-file blob $tag_sha1)\""
|
|
|
|
for batch in batch batch-check
|
|
do
|
|
for opt in t s e p
|
|
do
|
|
test_expect_success "Passing -$opt with --$batch fails" '
|
|
test_must_fail git cat-file --$batch -$opt $hello_sha1
|
|
'
|
|
|
|
test_expect_success "Passing --$batch with -$opt fails" '
|
|
test_must_fail git cat-file -$opt --$batch $hello_sha1
|
|
'
|
|
done
|
|
|
|
test_expect_success "Passing <type> with --$batch fails" '
|
|
test_must_fail git cat-file --$batch blob $hello_sha1
|
|
'
|
|
|
|
test_expect_success "Passing --$batch with <type> fails" '
|
|
test_must_fail git cat-file blob --$batch $hello_sha1
|
|
'
|
|
|
|
test_expect_success "Passing sha1 with --$batch fails" '
|
|
test_must_fail git cat-file --$batch $hello_sha1
|
|
'
|
|
done
|
|
|
|
for opt in t s e p
|
|
do
|
|
test_expect_success "Passing -$opt with --follow-symlinks fails" '
|
|
test_must_fail git cat-file --follow-symlinks -$opt $hello_sha1
|
|
'
|
|
done
|
|
|
|
test_expect_success "--batch-check for a non-existent named object" '
|
|
test "foobar42 missing
|
|
foobar84 missing" = \
|
|
"$( ( echo foobar42; echo_without_newline foobar84; ) | git cat-file --batch-check)"
|
|
'
|
|
|
|
test_expect_success "--batch-check for a non-existent hash" '
|
|
test "0000000000000000000000000000000000000042 missing
|
|
0000000000000000000000000000000000000084 missing" = \
|
|
"$( ( echo 0000000000000000000000000000000000000042;
|
|
echo_without_newline 0000000000000000000000000000000000000084; ) |
|
|
git cat-file --batch-check)"
|
|
'
|
|
|
|
test_expect_success "--batch for an existent and a non-existent hash" '
|
|
test "$tag_sha1 tag $tag_size
|
|
$tag_content
|
|
0000000000000000000000000000000000000000 missing" = \
|
|
"$( ( echo $tag_sha1;
|
|
echo_without_newline 0000000000000000000000000000000000000000; ) |
|
|
git cat-file --batch)"
|
|
'
|
|
|
|
test_expect_success "--batch-check for an empty line" '
|
|
test " missing" = "$(echo | git cat-file --batch-check)"
|
|
'
|
|
|
|
test_expect_success 'empty --batch-check notices missing object' '
|
|
echo "$ZERO_OID missing" >expect &&
|
|
echo "$ZERO_OID" | git cat-file --batch-check="" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
batch_input="$hello_sha1
|
|
$commit_sha1
|
|
$tag_sha1
|
|
deadbeef
|
|
|
|
"
|
|
|
|
batch_output="$hello_sha1 blob $hello_size
|
|
$hello_content
|
|
$commit_sha1 commit $commit_size
|
|
$commit_content
|
|
$tag_sha1 tag $tag_size
|
|
$tag_content
|
|
deadbeef missing
|
|
missing"
|
|
|
|
test_expect_success '--batch with multiple sha1s gives correct format' '
|
|
test "$(maybe_remove_timestamp "$batch_output" 1)" = "$(maybe_remove_timestamp "$(echo_without_newline "$batch_input" | git cat-file --batch)" 1)"
|
|
'
|
|
|
|
batch_check_input="$hello_sha1
|
|
$tree_sha1
|
|
$commit_sha1
|
|
$tag_sha1
|
|
deadbeef
|
|
|
|
"
|
|
|
|
batch_check_output="$hello_sha1 blob $hello_size
|
|
$tree_sha1 tree $tree_size
|
|
$commit_sha1 commit $commit_size
|
|
$tag_sha1 tag $tag_size
|
|
deadbeef missing
|
|
missing"
|
|
|
|
test_expect_success "--batch-check with multiple sha1s gives correct format" '
|
|
test "$batch_check_output" = \
|
|
"$(echo_without_newline "$batch_check_input" | git cat-file --batch-check)"
|
|
'
|
|
|
|
test_expect_success 'setup blobs which are likely to delta' '
|
|
test-tool genrandom foo 10240 >foo &&
|
|
{ cat foo; echo plus; } >foo-plus &&
|
|
git add foo foo-plus &&
|
|
git commit -m foo &&
|
|
cat >blobs <<-\EOF
|
|
HEAD:foo
|
|
HEAD:foo-plus
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'confirm that neither loose blob is a delta' '
|
|
cat >expect <<-EOF &&
|
|
$ZERO_OID
|
|
$ZERO_OID
|
|
EOF
|
|
git cat-file --batch-check="%(deltabase)" <blobs >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# To avoid relying too much on the current delta heuristics,
|
|
# we will check only that one of the two objects is a delta
|
|
# against the other, but not the order. We can do so by just
|
|
# asking for the base of both, and checking whether either
|
|
# sha1 appears in the output.
|
|
test_expect_success '%(deltabase) reports packed delta bases' '
|
|
git repack -ad &&
|
|
git cat-file --batch-check="%(deltabase)" <blobs >actual &&
|
|
{
|
|
grep "$(git rev-parse HEAD:foo)" actual ||
|
|
grep "$(git rev-parse HEAD:foo-plus)" actual
|
|
}
|
|
'
|
|
|
|
bogus_type="bogus"
|
|
bogus_content="bogus"
|
|
bogus_size=$(strlen "$bogus_content")
|
|
bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin)
|
|
|
|
test_expect_success "Type of broken object is correct" '
|
|
echo $bogus_type >expect &&
|
|
git cat-file -t --allow-unknown-type $bogus_sha1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "Size of broken object is correct" '
|
|
echo $bogus_size >expect &&
|
|
git cat-file -s --allow-unknown-type $bogus_sha1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clean up broken object' '
|
|
rm .git/objects/$(test_oid_to_path $bogus_sha1)
|
|
'
|
|
|
|
bogus_type="abcdefghijklmnopqrstuvwxyz1234679"
|
|
bogus_content="bogus"
|
|
bogus_size=$(strlen "$bogus_content")
|
|
bogus_sha1=$(echo_without_newline "$bogus_content" | git hash-object -t $bogus_type --literally -w --stdin)
|
|
|
|
test_expect_success "Type of broken object is correct when type is large" '
|
|
echo $bogus_type >expect &&
|
|
git cat-file -t --allow-unknown-type $bogus_sha1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success "Size of large broken object is correct when type is large" '
|
|
echo $bogus_size >expect &&
|
|
git cat-file -s --allow-unknown-type $bogus_sha1 >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clean up broken object' '
|
|
rm .git/objects/$(test_oid_to_path $bogus_sha1)
|
|
'
|
|
|
|
# Tests for git cat-file --follow-symlinks
|
|
test_expect_success 'prep for symlink tests' '
|
|
echo_without_newline "$hello_content" >morx &&
|
|
test_ln_s_add morx same-dir-link &&
|
|
test_ln_s_add dir link-to-dir &&
|
|
test_ln_s_add ../fleem out-of-repo-link &&
|
|
test_ln_s_add .. out-of-repo-link-dir &&
|
|
test_ln_s_add same-dir-link link-to-link &&
|
|
test_ln_s_add nope broken-same-dir-link &&
|
|
mkdir dir &&
|
|
test_ln_s_add ../morx dir/parent-dir-link &&
|
|
test_ln_s_add .. dir/link-dir &&
|
|
test_ln_s_add ../../escape dir/out-of-repo-link &&
|
|
test_ln_s_add ../.. dir/out-of-repo-link-dir &&
|
|
test_ln_s_add nope dir/broken-link-in-dir &&
|
|
mkdir dir/subdir &&
|
|
test_ln_s_add ../../morx dir/subdir/grandparent-dir-link &&
|
|
test_ln_s_add ../../../great-escape dir/subdir/out-of-repo-link &&
|
|
test_ln_s_add ../../.. dir/subdir/out-of-repo-link-dir &&
|
|
test_ln_s_add ../../../ dir/subdir/out-of-repo-link-dir-trailing &&
|
|
test_ln_s_add ../parent-dir-link dir/subdir/parent-dir-link-to-link &&
|
|
echo_without_newline "$hello_content" >dir/subdir/ind2 &&
|
|
echo_without_newline "$hello_content" >dir/ind1 &&
|
|
test_ln_s_add dir dirlink &&
|
|
test_ln_s_add dir/subdir subdirlink &&
|
|
test_ln_s_add subdir/ind2 dir/link-to-child &&
|
|
test_ln_s_add dir/link-to-child link-to-down-link &&
|
|
test_ln_s_add dir/.. up-down &&
|
|
test_ln_s_add dir/../ up-down-trailing &&
|
|
test_ln_s_add dir/../morx up-down-file &&
|
|
test_ln_s_add dir/../../morx up-up-down-file &&
|
|
test_ln_s_add subdirlink/../../morx up-two-down-file &&
|
|
test_ln_s_add loop1 loop2 &&
|
|
test_ln_s_add loop2 loop1 &&
|
|
git add morx dir/subdir/ind2 dir/ind1 &&
|
|
git commit -am "test" &&
|
|
echo $hello_sha1 blob $hello_size >found
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for non-links' '
|
|
echo HEAD:morx | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual &&
|
|
echo HEAD:nope missing >expect &&
|
|
echo HEAD:nope | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for in-repo, same-dir links' '
|
|
echo HEAD:same-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for in-repo, links to dirs' '
|
|
echo HEAD:link-to-dir/ind1 | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual
|
|
'
|
|
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for broken in-repo, same-dir links' '
|
|
echo dangling 25 >expect &&
|
|
echo HEAD:broken-same-dir-link >>expect &&
|
|
echo HEAD:broken-same-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for same-dir links-to-links' '
|
|
echo HEAD:link-to-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for parent-dir links' '
|
|
echo HEAD:dir/parent-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual &&
|
|
echo notdir 29 >expect &&
|
|
echo HEAD:dir/parent-dir-link/nope >>expect &&
|
|
echo HEAD:dir/parent-dir-link/nope | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for .. links' '
|
|
echo dangling 22 >expect &&
|
|
echo HEAD:dir/link-dir/nope >>expect &&
|
|
echo HEAD:dir/link-dir/nope | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo HEAD:dir/link-dir/morx | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual &&
|
|
echo dangling 27 >expect &&
|
|
echo HEAD:dir/broken-link-in-dir >>expect &&
|
|
echo HEAD:dir/broken-link-in-dir | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for ../.. links' '
|
|
echo notdir 41 >expect &&
|
|
echo HEAD:dir/subdir/grandparent-dir-link/nope >>expect &&
|
|
echo HEAD:dir/subdir/grandparent-dir-link/nope | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo HEAD:dir/subdir/grandparent-dir-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual &&
|
|
echo HEAD:dir/subdir/parent-dir-link-to-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for dir/ links' '
|
|
echo dangling 17 >expect &&
|
|
echo HEAD:dirlink/morx >>expect &&
|
|
echo HEAD:dirlink/morx | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo $hello_sha1 blob $hello_size >expect &&
|
|
echo HEAD:dirlink/ind1 | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for dir/subdir links' '
|
|
echo dangling 20 >expect &&
|
|
echo HEAD:subdirlink/morx >>expect &&
|
|
echo HEAD:subdirlink/morx | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo HEAD:subdirlink/ind2 | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for dir ->subdir links' '
|
|
echo notdir 27 >expect &&
|
|
echo HEAD:dir/link-to-child/morx >>expect &&
|
|
echo HEAD:dir/link-to-child/morx | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo HEAD:dir/link-to-child | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual &&
|
|
echo HEAD:link-to-down-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks' '
|
|
echo symlink 8 >expect &&
|
|
echo ../fleem >>expect &&
|
|
echo HEAD:out-of-repo-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo symlink 2 >expect &&
|
|
echo .. >>expect &&
|
|
echo HEAD:out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in dirs' '
|
|
echo symlink 9 >expect &&
|
|
echo ../escape >>expect &&
|
|
echo HEAD:dir/out-of-repo-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo symlink 2 >expect &&
|
|
echo .. >>expect &&
|
|
echo HEAD:dir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for out-of-repo symlinks in subdirs' '
|
|
echo symlink 15 >expect &&
|
|
echo ../great-escape >>expect &&
|
|
echo HEAD:dir/subdir/out-of-repo-link | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo symlink 2 >expect &&
|
|
echo .. >>expect &&
|
|
echo HEAD:dir/subdir/out-of-repo-link-dir | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo symlink 3 >expect &&
|
|
echo ../ >>expect &&
|
|
echo HEAD:dir/subdir/out-of-repo-link-dir-trailing | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlinks works for symlinks with internal ..' '
|
|
echo HEAD: | git cat-file --batch-check >expect &&
|
|
echo HEAD:up-down | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo HEAD:up-down-trailing | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo HEAD:up-down-file | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual &&
|
|
echo symlink 7 >expect &&
|
|
echo ../morx >>expect &&
|
|
echo HEAD:up-up-down-file | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual &&
|
|
echo HEAD:up-two-down-file | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp found actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch-check --follow-symlink breaks loops' '
|
|
echo loop 10 >expect &&
|
|
echo HEAD:loop1 >>expect &&
|
|
echo HEAD:loop1 | git cat-file --batch-check --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git cat-file --batch --follow-symlink returns correct sha and mode' '
|
|
echo HEAD:morx | git cat-file --batch >expect &&
|
|
echo HEAD:morx | git cat-file --batch --follow-symlinks >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'cat-file --batch-all-objects shows all objects' '
|
|
# make new repos so we know the full set of objects; we will
|
|
# also make sure that there are some packed and some loose
|
|
# objects, some referenced and some not, some duplicates, and that
|
|
# there are some available only via alternates.
|
|
git init all-one &&
|
|
(
|
|
cd all-one &&
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -qm base &&
|
|
git rev-parse HEAD HEAD^{tree} HEAD:file &&
|
|
git repack -ad &&
|
|
echo not-cloned | git hash-object -w --stdin
|
|
) >expect.unsorted &&
|
|
git clone -s all-one all-two &&
|
|
(
|
|
cd all-two &&
|
|
echo local-unref | git hash-object -w --stdin
|
|
) >>expect.unsorted &&
|
|
git -C all-two rev-parse HEAD:file |
|
|
git -C all-two pack-objects .git/objects/pack/pack &&
|
|
sort <expect.unsorted >expect &&
|
|
git -C all-two cat-file --batch-all-objects \
|
|
--batch-check="%(objectname)" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# The only user-visible difference is that the objects are no longer sorted,
|
|
# and the resulting sort order is undefined. So we can only check that it
|
|
# produces the same objects as the ordered case, but that at least exercises
|
|
# the code.
|
|
test_expect_success 'cat-file --unordered works' '
|
|
git -C all-two cat-file --batch-all-objects --unordered \
|
|
--batch-check="%(objectname)" >actual.unsorted &&
|
|
sort <actual.unsorted >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'set up object list for --batch-all-objects tests' '
|
|
git -C all-two cat-file --batch-all-objects --batch-check="%(objectname)" >objects
|
|
'
|
|
|
|
test_expect_success 'cat-file --batch="%(objectname)" with --batch-all-objects will work' '
|
|
git -C all-two cat-file --batch="%(objectname)" <objects >expect &&
|
|
git -C all-two cat-file --batch-all-objects --batch="%(objectname)" >actual &&
|
|
cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'cat-file --batch="%(rest)" with --batch-all-objects will work' '
|
|
git -C all-two cat-file --batch="%(rest)" <objects >expect &&
|
|
git -C all-two cat-file --batch-all-objects --batch="%(rest)" >actual &&
|
|
cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'cat-file --batch="batman" with --batch-all-objects will work' '
|
|
git -C all-two cat-file --batch="batman" <objects >expect &&
|
|
git -C all-two cat-file --batch-all-objects --batch="batman" >actual &&
|
|
cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'set up replacement object' '
|
|
orig=$(git rev-parse HEAD) &&
|
|
git cat-file commit $orig >orig &&
|
|
{
|
|
cat orig &&
|
|
echo extra
|
|
} >fake &&
|
|
fake=$(git hash-object -t commit -w fake) &&
|
|
orig_size=$(git cat-file -s $orig) &&
|
|
fake_size=$(git cat-file -s $fake) &&
|
|
git replace $orig $fake
|
|
'
|
|
|
|
test_expect_success 'cat-file --batch respects replace objects' '
|
|
git cat-file --batch >actual <<-EOF &&
|
|
$orig
|
|
EOF
|
|
{
|
|
echo "$orig commit $fake_size" &&
|
|
cat fake &&
|
|
echo
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'cat-file --batch-check respects replace objects' '
|
|
git cat-file --batch-check >actual <<-EOF &&
|
|
$orig
|
|
EOF
|
|
echo "$orig commit $fake_size" >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Pull the entry for object with oid "$1" out of the output of
|
|
# "cat-file --batch", including its object content (which requires
|
|
# parsing and reading a set amount of bytes, hence perl).
|
|
extract_batch_output () {
|
|
perl -ne '
|
|
BEGIN { $oid = shift }
|
|
if (/^$oid \S+ (\d+)$/) {
|
|
print;
|
|
read STDIN, my $buf, $1;
|
|
print $buf;
|
|
print "\n";
|
|
}
|
|
' "$@"
|
|
}
|
|
|
|
test_expect_success 'cat-file --batch-all-objects --batch ignores replace' '
|
|
git cat-file --batch-all-objects --batch >actual.raw &&
|
|
extract_batch_output $orig <actual.raw >actual &&
|
|
{
|
|
echo "$orig commit $orig_size" &&
|
|
cat orig &&
|
|
echo
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'cat-file --batch-all-objects --batch-check ignores replace' '
|
|
git cat-file --batch-all-objects --batch-check >actual.raw &&
|
|
grep ^$orig actual.raw >actual &&
|
|
echo "$orig commit $orig_size" >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|