2007-01-19 02:26:24 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Shawn Pearce
|
|
|
|
#
|
|
|
|
|
2008-09-10 05:25:25 +08:00
|
|
|
test_description='test git fast-import utility'
|
2020-11-19 07:44:42 +08:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-19 07:44:19 +08:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2007-01-19 02:26:24 +08:00
|
|
|
. ./test-lib.sh
|
2021-02-12 21:29:40 +08:00
|
|
|
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2012-04-20 14:25:09 +08:00
|
|
|
verify_packs () {
|
|
|
|
for p in .git/objects/pack/*.pack
|
|
|
|
do
|
|
|
|
git verify-pack "$@" "$p" || return
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
2007-01-19 03:49:05 +08:00
|
|
|
file2_data='file2
|
|
|
|
second line of EOF'
|
|
|
|
|
|
|
|
file3_data='EOF
|
|
|
|
in 3rd file
|
|
|
|
END'
|
|
|
|
|
|
|
|
file4_data=abcd
|
|
|
|
file4_len=4
|
|
|
|
|
2007-01-19 04:17:58 +08:00
|
|
|
file5_data='an inline file.
|
|
|
|
we should see it later.'
|
|
|
|
|
|
|
|
file6_data='#!/bin/sh
|
|
|
|
echo "$@"'
|
|
|
|
|
2007-01-19 02:26:24 +08:00
|
|
|
###
|
|
|
|
### series A
|
|
|
|
###
|
|
|
|
|
2010-11-29 03:45:01 +08:00
|
|
|
test_expect_success 'empty stream succeeds' '
|
2016-04-26 05:17:28 +08:00
|
|
|
git config fastimport.unpackLimit 0 &&
|
2010-11-29 03:45:01 +08:00
|
|
|
git fast-import </dev/null
|
|
|
|
'
|
|
|
|
|
strbuf_getwholeline: NUL-terminate getdelim buffer on error
Commit 0cc30e0 (strbuf_getwholeline: use getdelim if it is
available, 2015-04-16) tries to clean up after getdelim()
returns EOF, but gets one case wrong, which can lead in some
obscure cases to us reading uninitialized memory.
After getdelim() returns -1, we re-initialize the strbuf
only if sb->buf is NULL. The thinking was that either:
1. We fed an existing allocated buffer to getdelim(), and
at most it would have realloc'd, leaving our NUL in
place.
2. We didn't have a buffer to feed, so we gave getdelim()
NULL; sb->buf will remain NULL, and we just want to
restore the empty slopbuf.
But that second case isn't quite right. getdelim() may
allocate a buffer, write nothing into it, and then return
EOF. The resulting strbuf rightfully has sb->len set to "0",
but is missing the NUL terminator in the first byte.
Most call-sites are fine with this. They see the EOF and
don't bother looking at the strbuf. Or they notice that
sb->len is empty, and don't look at the contents. But
there's at least one case that does neither, and relies on
parsing the resulting (possibly zero-length) string:
fast-import. You can see this in action with the new test
(though we probably only notice failure there when run with
--valgrind or ASAN).
We can fix this by unconditionally resetting the strbuf when
we have a buffer after getdelim(). That fixes case 2 above.
Case 1 is probably already fine in practice, but it does not
hurt for us to re-assert our invariants (especially because
we are relying on whatever getdelim() happens to do, which
may vary from platform to platform). Our fix covers that
case, too.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-06 02:43:30 +08:00
|
|
|
test_expect_success 'truncated stream complains' '
|
|
|
|
echo "tag foo" | test_must_fail git fast-import
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: create pack from stdin' '
|
2015-11-20 03:09:49 +08:00
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
blob
|
|
|
|
mark :2
|
|
|
|
data <<EOF
|
|
|
|
$file2_data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :3
|
|
|
|
data <<END
|
|
|
|
$file3_data
|
|
|
|
END
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :4
|
|
|
|
data $file4_len
|
|
|
|
$file4_data
|
2020-11-19 07:44:42 +08:00
|
|
|
commit refs/heads/main
|
2015-11-20 03:09:49 +08:00
|
|
|
mark :5
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
initial
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 644 :2 file2
|
|
|
|
M 644 :3 file3
|
|
|
|
M 755 :4 file4
|
|
|
|
|
|
|
|
tag series-A
|
|
|
|
from :5
|
|
|
|
data <<EOF
|
|
|
|
An annotated tag without a tagger
|
|
|
|
EOF
|
|
|
|
|
|
|
|
tag series-A-blob
|
|
|
|
from :3
|
|
|
|
data <<EOF
|
|
|
|
An annotated tag that annotates a blob.
|
|
|
|
EOF
|
|
|
|
|
fast-import: fix handling of deleted tags
If our input stream includes a tag which is later deleted, we were not
properly deleting it. We did have a step which would delete it, but we
left a tag in the tag list noting that it needed to be updated, and the
updating of annotated tags occurred AFTER ref deletion. So, when we
record that a tag needs to be deleted, also remove it from the list of
annotated tags to update.
While this has likely been something that has not happened in practice,
it will come up more in order to support nested tags. For nested tags,
we either need to give temporary names to the intermediate tags and then
delete them, or else we need to use the final name for the intermediate
tags. If we use the final name for the intermediate tags, then in order
to keep the sanity check that someone doesn't try to update the same tag
twice, we need to delete the ref after creating the intermediate tag.
So, either way nested tags imply the need to delete temporary inner tag
references.
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-10-04 04:27:03 +08:00
|
|
|
tag to-be-deleted
|
|
|
|
from :3
|
|
|
|
data <<EOF
|
|
|
|
Another annotated tag that annotates a blob.
|
|
|
|
EOF
|
|
|
|
|
|
|
|
reset refs/tags/to-be-deleted
|
2020-07-30 07:14:11 +08:00
|
|
|
from $ZERO_OID
|
fast-import: fix handling of deleted tags
If our input stream includes a tag which is later deleted, we were not
properly deleting it. We did have a step which would delete it, but we
left a tag in the tag list noting that it needed to be updated, and the
updating of annotated tags occurred AFTER ref deletion. So, when we
record that a tag needs to be deleted, also remove it from the list of
annotated tags to update.
While this has likely been something that has not happened in practice,
it will come up more in order to support nested tags. For nested tags,
we either need to give temporary names to the intermediate tags and then
delete them, or else we need to use the final name for the intermediate
tags. If we use the final name for the intermediate tags, then in order
to keep the sanity check that someone doesn't try to update the same tag
twice, we need to delete the ref after creating the intermediate tag.
So, either way nested tags imply the need to delete temporary inner tag
references.
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-10-04 04:27:03 +08:00
|
|
|
|
2019-10-04 04:27:04 +08:00
|
|
|
tag nested
|
|
|
|
mark :6
|
|
|
|
from :4
|
|
|
|
data <<EOF
|
|
|
|
Tag of our lovely commit
|
|
|
|
EOF
|
|
|
|
|
|
|
|
reset refs/tags/nested
|
2020-07-30 07:14:11 +08:00
|
|
|
from $ZERO_OID
|
2019-10-04 04:27:04 +08:00
|
|
|
|
|
|
|
tag nested
|
|
|
|
mark :7
|
|
|
|
from :6
|
|
|
|
data <<EOF
|
|
|
|
Tag of tag of our lovely commit
|
|
|
|
EOF
|
|
|
|
|
2019-10-04 04:27:05 +08:00
|
|
|
alias
|
|
|
|
mark :8
|
|
|
|
to :5
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import --export-marks=marks.out <input &&
|
2020-11-19 07:44:42 +08:00
|
|
|
git whatchanged main
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'A: verify pack' '
|
|
|
|
verify_packs
|
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: verify commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
initial
|
|
|
|
EOF
|
2020-11-19 07:44:42 +08:00
|
|
|
git cat-file commit main | sed 1d >actual &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: verify tree' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
100644 blob file2
|
|
|
|
100644 blob file3
|
|
|
|
100755 blob file4
|
|
|
|
EOF
|
2020-11-19 07:44:42 +08:00
|
|
|
git cat-file -p main^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: verify file2' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$file2_data" >expect &&
|
2020-11-19 07:44:42 +08:00
|
|
|
git cat-file blob main:file2 >actual &&
|
2015-11-20 03:09:46 +08:00
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: verify file3' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$file3_data" >expect &&
|
2020-11-19 07:44:42 +08:00
|
|
|
git cat-file blob main:file3 >actual &&
|
2015-11-20 03:09:46 +08:00
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: verify file4' '
|
2015-11-20 03:09:49 +08:00
|
|
|
printf "$file4_data" >expect &&
|
2020-11-19 07:44:42 +08:00
|
|
|
git cat-file blob main:file4 >actual &&
|
2015-11-20 03:09:46 +08:00
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2008-12-20 06:41:21 +08:00
|
|
|
test_expect_success 'A: verify tag/series-A' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-11-19 07:44:42 +08:00
|
|
|
object $(git rev-parse refs/heads/main)
|
2015-11-20 03:09:49 +08:00
|
|
|
type commit
|
|
|
|
tag series-A
|
|
|
|
|
|
|
|
An annotated tag without a tagger
|
|
|
|
EOF
|
2008-12-20 06:41:21 +08:00
|
|
|
git cat-file tag tags/series-A >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2011-08-22 20:10:18 +08:00
|
|
|
test_expect_success 'A: verify tag/series-A-blob' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-11-19 07:44:42 +08:00
|
|
|
object $(git rev-parse refs/heads/main:file3)
|
2015-11-20 03:09:49 +08:00
|
|
|
type blob
|
|
|
|
tag series-A-blob
|
|
|
|
|
|
|
|
An annotated tag that annotates a blob.
|
|
|
|
EOF
|
2011-08-22 20:10:18 +08:00
|
|
|
git cat-file tag tags/series-A-blob >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
fast-import: fix handling of deleted tags
If our input stream includes a tag which is later deleted, we were not
properly deleting it. We did have a step which would delete it, but we
left a tag in the tag list noting that it needed to be updated, and the
updating of annotated tags occurred AFTER ref deletion. So, when we
record that a tag needs to be deleted, also remove it from the list of
annotated tags to update.
While this has likely been something that has not happened in practice,
it will come up more in order to support nested tags. For nested tags,
we either need to give temporary names to the intermediate tags and then
delete them, or else we need to use the final name for the intermediate
tags. If we use the final name for the intermediate tags, then in order
to keep the sanity check that someone doesn't try to update the same tag
twice, we need to delete the ref after creating the intermediate tag.
So, either way nested tags imply the need to delete temporary inner tag
references.
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-10-04 04:27:03 +08:00
|
|
|
test_expect_success 'A: verify tag deletion is successful' '
|
|
|
|
test_must_fail git rev-parse --verify refs/tags/to-be-deleted
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: verify marks output' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-11-19 07:44:42 +08:00
|
|
|
:2 $(git rev-parse --verify main:file2)
|
|
|
|
:3 $(git rev-parse --verify main:file3)
|
|
|
|
:4 $(git rev-parse --verify main:file4)
|
|
|
|
:5 $(git rev-parse --verify main^0)
|
2019-10-04 04:27:04 +08:00
|
|
|
:6 $(git cat-file tag nested | grep object | cut -d" " -f 2)
|
|
|
|
:7 $(git rev-parse --verify nested)
|
2020-11-19 07:44:42 +08:00
|
|
|
:8 $(git rev-parse --verify main^0)
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp expect marks.out
|
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: verify marks import' '
|
|
|
|
git fast-import \
|
2007-03-08 07:07:26 +08:00
|
|
|
--import-marks=marks.out \
|
|
|
|
--export-marks=marks.new \
|
|
|
|
</dev/null &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp expect marks.new
|
|
|
|
'
|
2007-03-08 07:07:26 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: tag blob by sha1' '
|
2015-11-20 03:09:49 +08:00
|
|
|
test_tick &&
|
|
|
|
new_blob=$(echo testing | git hash-object --stdin) &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
tag series-A-blob-2
|
2020-11-19 07:44:42 +08:00
|
|
|
from $(git rev-parse refs/heads/main:file3)
|
2015-11-20 03:09:49 +08:00
|
|
|
data <<EOF
|
|
|
|
Tag blob by sha1.
|
|
|
|
EOF
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :6
|
|
|
|
data <<EOF
|
|
|
|
testing
|
|
|
|
EOF
|
|
|
|
|
|
|
|
commit refs/heads/new_blob
|
|
|
|
committer <> 0 +0000
|
|
|
|
data 0
|
|
|
|
M 644 :6 new_blob
|
|
|
|
#pretend we got sha1 from fast-import
|
|
|
|
ls "new_blob"
|
|
|
|
|
|
|
|
tag series-A-blob-3
|
|
|
|
from $new_blob
|
|
|
|
data <<EOF
|
|
|
|
Tag new_blob.
|
|
|
|
EOF
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
cat >expect <<-EOF &&
|
2020-11-19 07:44:42 +08:00
|
|
|
object $(git rev-parse refs/heads/main:file3)
|
2015-11-20 03:09:49 +08:00
|
|
|
type blob
|
|
|
|
tag series-A-blob-2
|
|
|
|
|
|
|
|
Tag blob by sha1.
|
|
|
|
object $new_blob
|
|
|
|
type blob
|
|
|
|
tag series-A-blob-3
|
|
|
|
|
|
|
|
Tag new_blob.
|
|
|
|
EOF
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
2011-08-22 20:10:18 +08:00
|
|
|
git cat-file tag tags/series-A-blob-2 >actual &&
|
2011-08-22 20:10:19 +08:00
|
|
|
git cat-file tag tags/series-A-blob-3 >>actual &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2011-08-22 20:10:18 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'A: verify marks import does not crash' '
|
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/verify--import-marks
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
recreate from :5
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from :5
|
|
|
|
M 755 :2 copy-of-file2
|
2007-05-24 12:32:31 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-05-24 12:32:31 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import --import-marks=marks.out <input &&
|
|
|
|
git whatchanged verify--import-marks
|
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'A: verify pack' '
|
|
|
|
verify_packs
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'A: verify diff' '
|
2020-11-19 07:44:42 +08:00
|
|
|
copy=$(git rev-parse --verify main:file2) &&
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:11 +08:00
|
|
|
:000000 100755 $ZERO_OID $copy A copy-of-file2
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2020-11-19 07:44:42 +08:00
|
|
|
git diff-tree -M -r main verify--import-marks >actual &&
|
2015-11-20 03:09:43 +08:00
|
|
|
compare_diff_raw expect actual &&
|
2020-11-19 07:44:42 +08:00
|
|
|
test $(git rev-parse --verify main:file2) \
|
2016-01-12 19:49:35 +08:00
|
|
|
= $(git rev-parse --verify verify--import-marks:copy-of-file2)
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-05-24 12:32:31 +08:00
|
|
|
|
2010-07-13 19:51:48 +08:00
|
|
|
test_expect_success 'A: export marks with large values' '
|
2015-11-20 03:09:49 +08:00
|
|
|
test_tick &&
|
|
|
|
mt=$(git hash-object --stdin < /dev/null) &&
|
|
|
|
>input.blob &&
|
|
|
|
>marks.exp &&
|
|
|
|
>tree.exp &&
|
|
|
|
|
|
|
|
cat >input.commit <<-EOF &&
|
|
|
|
commit refs/heads/verify--dump-marks
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
test the sparse array dumping routines with exponentially growing marks
|
|
|
|
COMMIT
|
|
|
|
EOF
|
|
|
|
|
|
|
|
i=0 l=4 m=6 n=7 &&
|
|
|
|
while test "$i" -lt 27
|
|
|
|
do
|
|
|
|
cat >>input.blob <<-EOF &&
|
|
|
|
blob
|
|
|
|
mark :$l
|
|
|
|
data 0
|
|
|
|
blob
|
|
|
|
mark :$m
|
|
|
|
data 0
|
|
|
|
blob
|
|
|
|
mark :$n
|
|
|
|
data 0
|
|
|
|
EOF
|
|
|
|
echo "M 100644 :$l l$i" >>input.commit &&
|
|
|
|
echo "M 100644 :$m m$i" >>input.commit &&
|
|
|
|
echo "M 100644 :$n n$i" >>input.commit &&
|
|
|
|
|
|
|
|
echo ":$l $mt" >>marks.exp &&
|
|
|
|
echo ":$m $mt" >>marks.exp &&
|
|
|
|
echo ":$n $mt" >>marks.exp &&
|
|
|
|
|
|
|
|
printf "100644 blob $mt\tl$i\n" >>tree.exp &&
|
|
|
|
printf "100644 blob $mt\tm$i\n" >>tree.exp &&
|
|
|
|
printf "100644 blob $mt\tn$i\n" >>tree.exp &&
|
|
|
|
|
|
|
|
l=$(($l + $l)) &&
|
|
|
|
m=$(($m + $m)) &&
|
|
|
|
n=$(($l + $n)) &&
|
|
|
|
|
|
|
|
i=$((1 + $i)) || return 1
|
|
|
|
done &&
|
|
|
|
|
|
|
|
sort tree.exp > tree.exp_s &&
|
|
|
|
|
2010-07-13 19:51:48 +08:00
|
|
|
cat input.blob input.commit | git fast-import --export-marks=marks.large &&
|
|
|
|
git ls-tree refs/heads/verify--dump-marks >tree.out &&
|
|
|
|
test_cmp tree.exp_s tree.out &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp marks.exp marks.large
|
|
|
|
'
|
2010-07-13 19:51:48 +08:00
|
|
|
|
2007-01-19 02:26:24 +08:00
|
|
|
###
|
|
|
|
### series B
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'B: fail on invalid blob sha1' '
|
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/branch
|
|
|
|
mark :1
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
corrupt
|
|
|
|
COMMIT
|
|
|
|
|
2020-11-19 07:44:42 +08:00
|
|
|
from refs/heads/main
|
2020-07-30 07:14:11 +08:00
|
|
|
M 755 $(echo $ZERO_OID | sed -e "s/0$/1/") zero1
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:47 +08:00
|
|
|
test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_must_fail git fast-import <input
|
2008-02-01 17:50:53 +08:00
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'B: accept branch name "TEMP_TAG"' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit TEMP_TAG
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
tag base
|
|
|
|
COMMIT
|
|
|
|
|
2020-11-19 07:44:42 +08:00
|
|
|
from refs/heads/main
|
2007-08-03 11:37:21 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-08-03 11:37:21 +08:00
|
|
|
|
t/t9300-fast-import.sh: prepare for `gc --cruft` by default
In a similar fashion as previous commits, adjust the fast-import tests
to prepare for "git gc" generating a cruft pack by default.
This adjustment is slightly different, however. Instead of relying on us
writing out the objects loose, and then calling `git prune` to remove
them, t9300 needs to be prepared to drop objects that would be moved
into cruft packs.
To do this, we can combine the `git gc` invocation with `git prune` into
one `git gc --prune`, which handles pruning both loose objects, and
objects that would otherwise be written to a cruft pack.
Likely this pattern of "git gc && git prune" started all the way back in
03db4525d3 (Support gitlinks in fast-import., 2008-07-19), which
happened after deprecating `git gc --prune` in 9e7d501990 (builtin-gc.c:
deprecate --prune, it now really has no effect, 2008-05-09).
After `--prune` was un-deprecated in 58e9d9d472 (gc: make --prune useful
again by accepting an optional parameter, 2009-02-14), this script got a
handful of new "git gc && git prune" instances via via 4cedb78cb5
(fast-import: add input format tests, 2011-08-11). These could have been
`git gc --prune`, but weren't (likely taking after 03db4525d3).
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-04-19 04:40:52 +08:00
|
|
|
test_when_finished "rm -f .git/TEMP_TAG && git gc --prune=now" &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
2021-06-01 00:56:18 +08:00
|
|
|
test $(test-tool ref-store main resolve-ref TEMP_TAG 0 | cut -f1 -d " " ) != "$ZERO_OID" &&
|
2020-11-19 07:44:42 +08:00
|
|
|
test $(git rev-parse main) = $(git rev-parse TEMP_TAG^)
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2011-08-11 18:21:06 +08:00
|
|
|
|
|
|
|
test_expect_success 'B: accept empty committer' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/empty-committer-1
|
|
|
|
committer <> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
empty commit
|
|
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:47 +08:00
|
|
|
test_when_finished "git update-ref -d refs/heads/empty-committer-1
|
t/t9300-fast-import.sh: prepare for `gc --cruft` by default
In a similar fashion as previous commits, adjust the fast-import tests
to prepare for "git gc" generating a cruft pack by default.
This adjustment is slightly different, however. Instead of relying on us
writing out the objects loose, and then calling `git prune` to remove
them, t9300 needs to be prepared to drop objects that would be moved
into cruft packs.
To do this, we can combine the `git gc` invocation with `git prune` into
one `git gc --prune`, which handles pruning both loose objects, and
objects that would otherwise be written to a cruft pack.
Likely this pattern of "git gc && git prune" started all the way back in
03db4525d3 (Support gitlinks in fast-import., 2008-07-19), which
happened after deprecating `git gc --prune` in 9e7d501990 (builtin-gc.c:
deprecate --prune, it now really has no effect, 2008-05-09).
After `--prune` was un-deprecated in 58e9d9d472 (gc: make --prune useful
again by accepting an optional parameter, 2009-02-14), this script got a
handful of new "git gc && git prune" instances via via 4cedb78cb5
(fast-import: add input format tests, 2011-08-11). These could have been
`git gc --prune`, but weren't (likely taking after 03db4525d3).
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-04-19 04:40:52 +08:00
|
|
|
git gc --prune=now" &&
|
2011-08-11 18:21:06 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
out=$(git fsck) &&
|
|
|
|
echo "$out" &&
|
|
|
|
test -z "$out"
|
|
|
|
'
|
|
|
|
|
2020-05-31 04:25:57 +08:00
|
|
|
test_expect_success 'B: reject invalid timezone' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/invalid-timezone
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800
|
|
|
|
data <<COMMIT
|
|
|
|
empty commit
|
|
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
test_when_finished "git update-ref -d refs/heads/invalid-timezone" &&
|
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'B: accept invalid timezone with raw-permissive' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/invalid-timezone
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800
|
|
|
|
data <<COMMIT
|
|
|
|
empty commit
|
|
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
git init invalid-timezone &&
|
|
|
|
git -C invalid-timezone fast-import --date-format=raw-permissive <input &&
|
|
|
|
git -C invalid-timezone cat-file -p invalid-timezone >out &&
|
|
|
|
grep "1234567890 [+]051800" out
|
|
|
|
'
|
|
|
|
|
2011-08-11 18:21:07 +08:00
|
|
|
test_expect_success 'B: accept and fixup committer with no name' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/empty-committer-2
|
|
|
|
committer <a@b.com> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
empty commit
|
|
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:47 +08:00
|
|
|
test_when_finished "git update-ref -d refs/heads/empty-committer-2
|
t/t9300-fast-import.sh: prepare for `gc --cruft` by default
In a similar fashion as previous commits, adjust the fast-import tests
to prepare for "git gc" generating a cruft pack by default.
This adjustment is slightly different, however. Instead of relying on us
writing out the objects loose, and then calling `git prune` to remove
them, t9300 needs to be prepared to drop objects that would be moved
into cruft packs.
To do this, we can combine the `git gc` invocation with `git prune` into
one `git gc --prune`, which handles pruning both loose objects, and
objects that would otherwise be written to a cruft pack.
Likely this pattern of "git gc && git prune" started all the way back in
03db4525d3 (Support gitlinks in fast-import., 2008-07-19), which
happened after deprecating `git gc --prune` in 9e7d501990 (builtin-gc.c:
deprecate --prune, it now really has no effect, 2008-05-09).
After `--prune` was un-deprecated in 58e9d9d472 (gc: make --prune useful
again by accepting an optional parameter, 2009-02-14), this script got a
handful of new "git gc && git prune" instances via via 4cedb78cb5
(fast-import: add input format tests, 2011-08-11). These could have been
`git gc --prune`, but weren't (likely taking after 03db4525d3).
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-04-19 04:40:52 +08:00
|
|
|
git gc --prune=now" &&
|
2011-08-11 18:21:06 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
out=$(git fsck) &&
|
|
|
|
echo "$out" &&
|
|
|
|
test -z "$out"
|
|
|
|
'
|
|
|
|
|
2011-08-11 18:21:08 +08:00
|
|
|
test_expect_success 'B: fail on invalid committer (1)' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/invalid-committer
|
|
|
|
committer Name email> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
empty commit
|
|
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:47 +08:00
|
|
|
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
|
2011-08-11 18:21:06 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
2011-08-11 18:21:08 +08:00
|
|
|
test_expect_success 'B: fail on invalid committer (2)' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/invalid-committer
|
|
|
|
committer Name <e<mail> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
empty commit
|
|
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:47 +08:00
|
|
|
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
|
2011-08-11 18:21:06 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
2011-08-11 18:21:08 +08:00
|
|
|
test_expect_success 'B: fail on invalid committer (3)' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/invalid-committer
|
|
|
|
committer Name <email>> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
empty commit
|
|
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:47 +08:00
|
|
|
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
|
2011-08-11 18:21:06 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
2011-08-11 18:21:08 +08:00
|
|
|
test_expect_success 'B: fail on invalid committer (4)' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/invalid-committer
|
|
|
|
committer Name <email $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
empty commit
|
|
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:47 +08:00
|
|
|
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
|
2011-08-11 18:21:06 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
2011-08-11 18:21:08 +08:00
|
|
|
test_expect_success 'B: fail on invalid committer (5)' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/invalid-committer
|
|
|
|
committer Name<email> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
empty commit
|
|
|
|
COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:47 +08:00
|
|
|
test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
|
2011-08-11 18:21:06 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
2007-01-19 02:26:24 +08:00
|
|
|
###
|
|
|
|
### series C
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'C: incremental import create pack from stdin' '
|
2016-01-12 19:49:35 +08:00
|
|
|
newf=$(echo hi newf | git hash-object -w --stdin) &&
|
2020-11-19 07:44:42 +08:00
|
|
|
oldf=$(git rev-parse --verify main:file2) &&
|
|
|
|
thrf=$(git rev-parse --verify main:file3) &&
|
2015-11-20 03:09:49 +08:00
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/branch
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
second
|
|
|
|
COMMIT
|
|
|
|
|
2020-11-19 07:44:42 +08:00
|
|
|
from refs/heads/main
|
2015-11-20 03:09:49 +08:00
|
|
|
M 644 $oldf file2/oldf
|
|
|
|
M 755 $newf file2/newf
|
|
|
|
D file3
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git whatchanged branch
|
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'C: verify pack' '
|
|
|
|
verify_packs
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'C: validate reuse existing blob' '
|
2016-01-12 19:49:35 +08:00
|
|
|
test $newf = $(git rev-parse --verify branch:file2/newf) &&
|
|
|
|
test $oldf = $(git rev-parse --verify branch:file2/oldf)
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'C: verify commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-11-19 07:44:42 +08:00
|
|
|
parent $(git rev-parse --verify main^0)
|
2015-11-20 03:09:49 +08:00
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
second
|
|
|
|
EOF
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit branch | sed 1d >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'C: validate rename result' '
|
2020-07-30 07:14:10 +08:00
|
|
|
zero=$ZERO_OID &&
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:000000 100755 $zero $newf A file2/newf
|
|
|
|
:100644 100644 $oldf $oldf R100 file2 file2/oldf
|
|
|
|
:100644 000000 $thrf $zero D file3
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2020-11-19 07:44:42 +08:00
|
|
|
git diff-tree -M -r main branch >actual &&
|
2015-11-20 03:09:43 +08:00
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2007-01-19 02:26:24 +08:00
|
|
|
|
2007-01-19 04:17:58 +08:00
|
|
|
###
|
|
|
|
### series D
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'D: inline data in commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/branch
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
third
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
M 644 inline newdir/interesting
|
|
|
|
data <<EOF
|
|
|
|
$file5_data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
M 755 inline newdir/exec.sh
|
|
|
|
data <<EOF
|
|
|
|
$file6_data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git whatchanged branch
|
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'D: verify pack' '
|
|
|
|
verify_packs
|
|
|
|
'
|
2007-01-19 04:17:58 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'D: validate new files added' '
|
2020-07-30 07:14:10 +08:00
|
|
|
f5id=$(echo "$file5_data" | git hash-object --stdin) &&
|
|
|
|
f6id=$(echo "$file6_data" | git hash-object --stdin) &&
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:11 +08:00
|
|
|
:000000 100755 $ZERO_OID $f6id A newdir/exec.sh
|
|
|
|
:000000 100644 $ZERO_OID $f5id A newdir/interesting
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
|
|
|
git diff-tree -M -r branch^ branch >actual &&
|
2015-11-20 03:09:43 +08:00
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2007-01-19 04:17:58 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'D: verify file5' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$file5_data" >expect &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file blob branch:newdir/interesting >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-01-19 04:17:58 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'D: verify file6' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$file6_data" >expect &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file blob branch:newdir/exec.sh >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-01-19 04:17:58 +08:00
|
|
|
|
2007-02-07 03:58:30 +08:00
|
|
|
###
|
|
|
|
### series E
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'E: rfc2822 date, --date-format=raw' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/branch
|
|
|
|
author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
|
|
|
|
data <<COMMIT
|
|
|
|
RFC 2822 type date
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
2007-02-07 03:58:30 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-02-07 03:58:30 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_must_fail git fast-import --date-format=raw <input
|
|
|
|
'
|
|
|
|
test_expect_success 'E: rfc2822 date, --date-format=rfc2822' '
|
|
|
|
git fast-import --date-format=rfc2822 <input
|
2008-02-01 17:50:53 +08:00
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'E: verify pack' '
|
|
|
|
verify_packs
|
|
|
|
'
|
2007-02-07 03:58:30 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'E: verify commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
|
|
|
|
|
|
|
|
RFC 2822 type date
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit branch | sed 1,2d >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-02-07 03:58:30 +08:00
|
|
|
|
2007-02-07 05:08:06 +08:00
|
|
|
###
|
|
|
|
### series F
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'F: non-fast-forward update skips' '
|
2016-01-12 19:49:35 +08:00
|
|
|
old_branch=$(git rev-parse --verify branch^0) &&
|
2015-11-20 03:09:49 +08:00
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/branch
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
losing things already?
|
|
|
|
COMMIT
|
2007-02-07 05:08:06 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch~1
|
2007-02-07 05:08:06 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
reset refs/heads/other
|
|
|
|
from refs/heads/branch
|
|
|
|
|
|
|
|
INPUT_END
|
2007-02-07 05:08:06 +08:00
|
|
|
|
2015-11-20 03:09:44 +08:00
|
|
|
test_must_fail git fast-import <input &&
|
|
|
|
# branch must remain unaffected
|
2016-01-12 19:49:35 +08:00
|
|
|
test $old_branch = $(git rev-parse --verify branch^0)
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'F: verify pack' '
|
|
|
|
verify_packs
|
|
|
|
'
|
2007-02-07 05:08:06 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'F: verify other commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2016-01-12 19:49:35 +08:00
|
|
|
tree $(git rev-parse branch~1^{tree})
|
|
|
|
parent $(git rev-parse branch~1)
|
2015-11-20 03:09:49 +08:00
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
losing things already?
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit other >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-02-07 05:08:06 +08:00
|
|
|
|
|
|
|
###
|
|
|
|
### series G
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'G: non-fast-forward update forced' '
|
2016-01-12 19:49:35 +08:00
|
|
|
old_branch=$(git rev-parse --verify branch^0) &&
|
2015-11-20 03:09:49 +08:00
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/branch
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
losing things already?
|
|
|
|
COMMIT
|
2007-02-07 05:08:06 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch~1
|
2007-02-07 05:08:06 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import --force <input
|
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'G: verify pack' '
|
|
|
|
verify_packs
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'G: branch changed, but logged' '
|
2016-01-12 19:49:35 +08:00
|
|
|
test $old_branch != $(git rev-parse --verify branch^0) &&
|
|
|
|
test $old_branch = $(git rev-parse --verify branch@{1})
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-02-07 05:08:06 +08:00
|
|
|
|
2007-02-07 15:03:03 +08:00
|
|
|
###
|
|
|
|
### series H
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'H: deletall, add 1' '
|
2015-11-20 03:09:49 +08:00
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/H
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
third
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
M 644 inline i-will-die
|
|
|
|
data <<EOF
|
|
|
|
this file will never exist.
|
|
|
|
EOF
|
|
|
|
|
|
|
|
deleteall
|
|
|
|
M 644 inline h/e/l/lo
|
|
|
|
data <<EOF
|
|
|
|
$file5_data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git whatchanged H
|
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'H: verify pack' '
|
|
|
|
verify_packs
|
|
|
|
'
|
2007-02-07 15:03:03 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'H: validate old files removed, new files added' '
|
2020-07-30 07:14:10 +08:00
|
|
|
f4id=$(git rev-parse HEAD:file4) &&
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100755 000000 $newf $zero D file2/newf
|
|
|
|
:100644 000000 $oldf $zero D file2/oldf
|
|
|
|
:100755 000000 $f4id $zero D file4
|
|
|
|
:100644 100644 $f5id $f5id R100 newdir/interesting h/e/l/lo
|
|
|
|
:100755 000000 $f6id $zero D newdir/exec.sh
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
|
|
|
git diff-tree -M -r H^ H >actual &&
|
2015-11-20 03:09:43 +08:00
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2007-02-07 15:03:03 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'H: verify file' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$file5_data" >expect &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file blob H:h/e/l/lo >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-02-07 15:03:03 +08:00
|
|
|
|
2007-02-12 08:45:56 +08:00
|
|
|
###
|
|
|
|
### series I
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'I: export-pack-edges' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/export-boundary
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
we have a border. its only 40 characters wide.
|
|
|
|
COMMIT
|
2007-02-12 08:45:56 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch
|
2007-02-12 08:45:56 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import --export-pack-edges=edges.list <input
|
|
|
|
'
|
2007-02-12 08:45:56 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'I: verify edge list' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2016-01-12 19:49:35 +08:00
|
|
|
.git/objects/pack/pack-.pack: $(git rev-parse --verify export-boundary)
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-02-12 08:45:56 +08:00
|
|
|
|
2007-02-12 17:08:43 +08:00
|
|
|
###
|
|
|
|
### series J
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'J: reset existing branch creates empty commit' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/J
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
create J
|
|
|
|
COMMIT
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
reset refs/heads/J
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/heads/J
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
initialize J
|
|
|
|
COMMIT
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input
|
|
|
|
'
|
|
|
|
test_expect_success 'J: branch has 1 commit, empty tree' '
|
2016-01-12 19:49:35 +08:00
|
|
|
test 1 = $(git rev-list J | wc -l) &&
|
|
|
|
test 0 = $(git ls-tree J | wc -l)
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'J: tag must fail on empty branch' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
reset refs/heads/J2
|
|
|
|
|
|
|
|
tag wrong_tag
|
|
|
|
from refs/heads/J2
|
|
|
|
data <<EOF
|
|
|
|
Tag branch that was reset.
|
|
|
|
EOF
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
2015-11-20 03:09:49 +08:00
|
|
|
|
2007-02-12 17:08:43 +08:00
|
|
|
###
|
|
|
|
### series K
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'K: reinit branch with from' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/K
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
create K
|
|
|
|
COMMIT
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/heads/K
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
redo K
|
|
|
|
COMMIT
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch^1
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input
|
|
|
|
'
|
|
|
|
test_expect_success 'K: verify K^1 = branch^1' '
|
2016-01-12 19:49:35 +08:00
|
|
|
test $(git rev-parse --verify branch^1) \
|
|
|
|
= $(git rev-parse --verify K^1)
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-02-12 17:08:43 +08:00
|
|
|
|
2007-03-13 02:58:50 +08:00
|
|
|
###
|
|
|
|
### series L
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'L: verify internal tree sorting' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data <<EOF
|
|
|
|
some data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :2
|
|
|
|
data <<EOF
|
|
|
|
other data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
commit refs/heads/L
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
create L
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 644 :1 b.
|
|
|
|
M 644 :1 b/other
|
|
|
|
M 644 :1 ba
|
|
|
|
|
|
|
|
commit refs/heads/L
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
update L
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 644 :2 b.
|
|
|
|
M 644 :2 b/other
|
|
|
|
M 644 :2 ba
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
cat >expect <<-EXPECT_END &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100644 100644 M b.
|
|
|
|
:040000 040000 M b
|
|
|
|
:100644 100644 M ba
|
2015-11-20 03:09:49 +08:00
|
|
|
EXPECT_END
|
|
|
|
|
|
|
|
git fast-import <input &&
|
2017-12-04 05:27:39 +08:00
|
|
|
GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev --raw L^ L >output &&
|
2020-07-30 07:14:10 +08:00
|
|
|
cut -d" " -f1,2,5 output >actual &&
|
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:49 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'L: nested tree copy does not corrupt deltas' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data <<EOF
|
|
|
|
the data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
commit refs/heads/L2
|
|
|
|
committer C O Mitter <committer@example.com> 1112912473 -0700
|
|
|
|
data <<COMMIT
|
|
|
|
init L2
|
|
|
|
COMMIT
|
|
|
|
M 644 :1 a/b/c
|
|
|
|
M 644 :1 a/b/d
|
|
|
|
M 644 :1 a/e/f
|
2007-03-13 02:58:50 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/heads/L2
|
|
|
|
committer C O Mitter <committer@example.com> 1112912473 -0700
|
|
|
|
data <<COMMIT
|
|
|
|
update L2
|
|
|
|
COMMIT
|
|
|
|
C a g
|
|
|
|
C a/e g/b
|
|
|
|
M 644 :1 g/b/h
|
|
|
|
INPUT_END
|
2007-03-13 02:58:50 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
g/b/f
|
|
|
|
g/b/h
|
|
|
|
EOF
|
2011-08-15 02:32:23 +08:00
|
|
|
|
2015-11-20 03:09:47 +08:00
|
|
|
test_when_finished "git update-ref -d refs/heads/L2" &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
2011-08-15 02:32:23 +08:00
|
|
|
git ls-tree L2 g/b/ >tmp &&
|
|
|
|
cat tmp | cut -f 2 >actual &&
|
|
|
|
test_cmp expect actual &&
|
2016-01-12 19:49:35 +08:00
|
|
|
git fsck $(git rev-parse L2)
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2011-08-15 02:32:23 +08:00
|
|
|
|
2007-07-10 10:58:23 +08:00
|
|
|
###
|
|
|
|
### series M
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'M: rename file in same subdirectory' '
|
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/M1
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
file rename
|
|
|
|
COMMIT
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch^0
|
|
|
|
R file2/newf file2/n.e.w.f
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100755 100755 $newf $newf R100 file2/newf file2/n.e.w.f
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -M -r M1^ M1 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'M: rename file to new subdirectory' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/M2
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
file rename
|
|
|
|
COMMIT
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch^0
|
|
|
|
R file2/newf i/am/new/to/you
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100755 100755 $newf $newf R100 file2/newf i/am/new/to/you
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -M -r M2^ M2 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'M: rename subdirectory to new subdirectory' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/M3
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
file rename
|
|
|
|
COMMIT
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/M2^0
|
|
|
|
R i other/sub
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100755 100755 $newf $newf R100 i/am/new/to/you other/sub/am/new/to/you
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -M -r M3^ M3 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2007-07-10 10:58:23 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'M: rename root to subdirectory' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/M4
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
rename root
|
|
|
|
COMMIT
|
2013-06-23 22:58:19 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/M2^0
|
|
|
|
R "" sub
|
2013-06-23 22:58:19 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2013-06-23 22:58:19 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100644 100644 $oldf $oldf R100 file2/oldf sub/file2/oldf
|
|
|
|
:100755 100755 $f4id $f4id R100 file4 sub/file4
|
|
|
|
:100755 100755 $newf $newf R100 i/am/new/to/you sub/i/am/new/to/you
|
|
|
|
:100755 100755 $f6id $f6id R100 newdir/exec.sh sub/newdir/exec.sh
|
|
|
|
:100644 100644 $f5id $f5id R100 newdir/interesting sub/newdir/interesting
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -M -r M4^ M4 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2013-06-23 22:58:19 +08:00
|
|
|
|
2007-07-15 13:40:37 +08:00
|
|
|
###
|
|
|
|
### series N
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'N: copy file in same subdirectory' '
|
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/N1
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
file copy
|
|
|
|
COMMIT
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch^0
|
|
|
|
C file2/newf file2/n.e.w.f
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100755 100755 $newf $newf C100 file2/newf file2/n.e.w.f
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'N: copy then modify subdirectory' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/N2
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
clean directory copy
|
|
|
|
COMMIT
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch^0
|
|
|
|
C file2 file3
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/heads/N2
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
modify directory copy
|
|
|
|
COMMIT
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
M 644 inline file3/file5
|
|
|
|
data <<EOF
|
|
|
|
$file5_data
|
|
|
|
EOF
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100644 100644 $f5id $f5id C100 newdir/interesting file3/file5
|
|
|
|
:100755 100755 $newf $newf C100 file2/newf file3/newf
|
|
|
|
:100644 100644 $oldf $oldf C100 file2/oldf file3/oldf
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'N: copy dirty subdirectory' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/N3
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
dirty directory copy
|
|
|
|
COMMIT
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
from refs/heads/branch^0
|
|
|
|
M 644 inline file2/file5
|
|
|
|
data <<EOF
|
|
|
|
$file5_data
|
|
|
|
EOF
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
C file2 file3
|
|
|
|
D file2/file5
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
2016-01-12 19:49:35 +08:00
|
|
|
test $(git rev-parse N2^{tree}) = $(git rev-parse N3^{tree})
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-07-15 13:40:37 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'N: copy directory by id' '
|
2020-07-30 07:14:10 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
:100755 100755 $newf $newf C100 file2/newf file3/newf
|
|
|
|
:100644 100644 $oldf $oldf C100 file2/oldf file3/oldf
|
2010-07-01 11:18:19 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
subdir=$(git rev-parse refs/heads/branch^0:file2) &&
|
|
|
|
cat >input <<-INPUT_END &&
|
2010-07-01 11:18:19 +08:00
|
|
|
commit refs/heads/N4
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy by tree hash
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
M 040000 $subdir file3
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2010-07-01 11:18:19 +08:00
|
|
|
|
fast-import: add 'ls' command
Lazy fast-import frontend authors that want to rely on the backend to
keep track of the content of the imported trees _almost_ have what
they need in the 'cat-blob' command (v1.7.4-rc0~30^2~3, 2010-11-28).
But it is not quite enough, since
(1) cat-blob can be used to retrieve the content of files, but
not their mode, and
(2) using cat-blob requires the frontend to keep track of a name
(mark number or object id) for each blob to be retrieved
Introduce an 'ls' command to complement cat-blob and take care of the
remaining needs. The 'ls' command finds what is at a given path
within a given tree-ish (tag, commit, or tree):
'ls' SP <dataref> SP <path> LF
or in fast-import's active commit:
'ls' SP <path> LF
The response is a single line sent through the cat-blob channel,
imitating ls-tree output. So for example:
FE> ls :1 Documentation
gfi> 040000 tree 9e6c2b599341d28a2a375f8207507e0a2a627fe9 Documentation
FE> ls 9e6c2b599341d28a2a375f8207507e0a2a627fe9 git-fast-import.txt
gfi> 100644 blob 4f92954396e3f0f97e75b6838a5635b583708870 git-fast-import.txt
FE> ls :1 RelNotes
gfi> 120000 blob b942e499449d97aeb50c73ca2bdc1c6e6d528743 RelNotes
FE> cat-blob b942e499449d97aeb50c73ca2bdc1c6e6d528743
gfi> b942e499449d97aeb50c73ca2bdc1c6e6d528743 blob 32
gfi> Documentation/RelNotes/1.7.4.txt
The most interesting parts of the reply are the first word, which is
a 6-digit octal mode (regular file, executable, symlink, directory,
or submodule), and the part from the second space to the tab, which is
a <dataref> that can be used in later cat-blob, ls, and filemodify (M)
commands to refer to the content (blob, tree, or commit) at that path.
If there is nothing there, the response is "missing some/path".
The intent is for this command to be used to read files from the
active commit, so a frontend can apply patches to them, and to copy
files and directories from previous revisions.
For example, proposed updates to svn-fe use this command in place of
its internal representation of the repository directory structure.
This simplifies the frontend a great deal and means support for
resuming an import in a separate fast-import run (i.e., incremental
import) is basically free.
Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Improved-by: Sverre Rabbelier <srabbelier@gmail.com>
2010-12-02 18:40:20 +08:00
|
|
|
test_expect_success PIPE 'N: read and copy directory' '
|
2020-07-30 07:14:10 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
:100755 100755 $newf $newf C100 file2/newf file3/newf
|
|
|
|
:100644 100644 $oldf $oldf C100 file2/oldf file3/oldf
|
fast-import: add 'ls' command
Lazy fast-import frontend authors that want to rely on the backend to
keep track of the content of the imported trees _almost_ have what
they need in the 'cat-blob' command (v1.7.4-rc0~30^2~3, 2010-11-28).
But it is not quite enough, since
(1) cat-blob can be used to retrieve the content of files, but
not their mode, and
(2) using cat-blob requires the frontend to keep track of a name
(mark number or object id) for each blob to be retrieved
Introduce an 'ls' command to complement cat-blob and take care of the
remaining needs. The 'ls' command finds what is at a given path
within a given tree-ish (tag, commit, or tree):
'ls' SP <dataref> SP <path> LF
or in fast-import's active commit:
'ls' SP <path> LF
The response is a single line sent through the cat-blob channel,
imitating ls-tree output. So for example:
FE> ls :1 Documentation
gfi> 040000 tree 9e6c2b599341d28a2a375f8207507e0a2a627fe9 Documentation
FE> ls 9e6c2b599341d28a2a375f8207507e0a2a627fe9 git-fast-import.txt
gfi> 100644 blob 4f92954396e3f0f97e75b6838a5635b583708870 git-fast-import.txt
FE> ls :1 RelNotes
gfi> 120000 blob b942e499449d97aeb50c73ca2bdc1c6e6d528743 RelNotes
FE> cat-blob b942e499449d97aeb50c73ca2bdc1c6e6d528743
gfi> b942e499449d97aeb50c73ca2bdc1c6e6d528743 blob 32
gfi> Documentation/RelNotes/1.7.4.txt
The most interesting parts of the reply are the first word, which is
a 6-digit octal mode (regular file, executable, symlink, directory,
or submodule), and the part from the second space to the tab, which is
a <dataref> that can be used in later cat-blob, ls, and filemodify (M)
commands to refer to the content (blob, tree, or commit) at that path.
If there is nothing there, the response is "missing some/path".
The intent is for this command to be used to read files from the
active commit, so a frontend can apply patches to them, and to copy
files and directories from previous revisions.
For example, proposed updates to svn-fe use this command in place of
its internal representation of the repository directory structure.
This simplifies the frontend a great deal and means support for
resuming an import in a separate fast-import run (i.e., incremental
import) is basically free.
Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Improved-by: Sverre Rabbelier <srabbelier@gmail.com>
2010-12-02 18:40:20 +08:00
|
|
|
EOF
|
|
|
|
git update-ref -d refs/heads/N4 &&
|
|
|
|
rm -f backflow &&
|
|
|
|
mkfifo backflow &&
|
|
|
|
(
|
|
|
|
exec <backflow &&
|
|
|
|
cat <<-EOF &&
|
|
|
|
commit refs/heads/N4
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy by tree hash, part 2
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
ls "file2"
|
|
|
|
EOF
|
|
|
|
read mode type tree filename &&
|
|
|
|
echo "M 040000 $tree file3"
|
|
|
|
) |
|
|
|
|
git fast-import --cat-blob-fd=3 3>backflow &&
|
|
|
|
git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success PIPE 'N: empty directory reads as missing' '
|
|
|
|
cat <<-\EOF >expect &&
|
|
|
|
OBJNAME
|
|
|
|
:000000 100644 OBJNAME OBJNAME A unrelated
|
|
|
|
EOF
|
|
|
|
echo "missing src" >expect.response &&
|
|
|
|
git update-ref -d refs/heads/read-empty &&
|
|
|
|
rm -f backflow &&
|
|
|
|
mkfifo backflow &&
|
|
|
|
(
|
|
|
|
exec <backflow &&
|
|
|
|
cat <<-EOF &&
|
|
|
|
commit refs/heads/read-empty
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
read "empty" (missing) directory
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 100644 inline src/greeting
|
|
|
|
data <<BLOB
|
|
|
|
hello
|
|
|
|
BLOB
|
|
|
|
C src/greeting dst1/non-greeting
|
|
|
|
C src/greeting unrelated
|
|
|
|
# leave behind "empty" src directory
|
|
|
|
D src/greeting
|
|
|
|
ls "src"
|
|
|
|
EOF
|
|
|
|
read -r line &&
|
|
|
|
printf "%s\n" "$line" >response &&
|
|
|
|
cat <<-\EOF
|
|
|
|
D dst1
|
|
|
|
D dst2
|
|
|
|
EOF
|
|
|
|
) |
|
|
|
|
git fast-import --cat-blob-fd=3 3>backflow &&
|
|
|
|
test_cmp expect.response response &&
|
|
|
|
git rev-list read-empty |
|
|
|
|
git diff-tree -r --root --stdin |
|
2018-05-13 10:24:15 +08:00
|
|
|
sed "s/$OID_REGEX/OBJNAME/g" >actual &&
|
fast-import: add 'ls' command
Lazy fast-import frontend authors that want to rely on the backend to
keep track of the content of the imported trees _almost_ have what
they need in the 'cat-blob' command (v1.7.4-rc0~30^2~3, 2010-11-28).
But it is not quite enough, since
(1) cat-blob can be used to retrieve the content of files, but
not their mode, and
(2) using cat-blob requires the frontend to keep track of a name
(mark number or object id) for each blob to be retrieved
Introduce an 'ls' command to complement cat-blob and take care of the
remaining needs. The 'ls' command finds what is at a given path
within a given tree-ish (tag, commit, or tree):
'ls' SP <dataref> SP <path> LF
or in fast-import's active commit:
'ls' SP <path> LF
The response is a single line sent through the cat-blob channel,
imitating ls-tree output. So for example:
FE> ls :1 Documentation
gfi> 040000 tree 9e6c2b599341d28a2a375f8207507e0a2a627fe9 Documentation
FE> ls 9e6c2b599341d28a2a375f8207507e0a2a627fe9 git-fast-import.txt
gfi> 100644 blob 4f92954396e3f0f97e75b6838a5635b583708870 git-fast-import.txt
FE> ls :1 RelNotes
gfi> 120000 blob b942e499449d97aeb50c73ca2bdc1c6e6d528743 RelNotes
FE> cat-blob b942e499449d97aeb50c73ca2bdc1c6e6d528743
gfi> b942e499449d97aeb50c73ca2bdc1c6e6d528743 blob 32
gfi> Documentation/RelNotes/1.7.4.txt
The most interesting parts of the reply are the first word, which is
a 6-digit octal mode (regular file, executable, symlink, directory,
or submodule), and the part from the second space to the tab, which is
a <dataref> that can be used in later cat-blob, ls, and filemodify (M)
commands to refer to the content (blob, tree, or commit) at that path.
If there is nothing there, the response is "missing some/path".
The intent is for this command to be used to read files from the
active commit, so a frontend can apply patches to them, and to copy
files and directories from previous revisions.
For example, proposed updates to svn-fe use this command in place of
its internal representation of the repository directory structure.
This simplifies the frontend a great deal and means support for
resuming an import in a separate fast-import run (i.e., incremental
import) is basically free.
Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Improved-by: Sverre Rabbelier <srabbelier@gmail.com>
2010-12-02 18:40:20 +08:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'N: copy root directory by tree hash' '
|
2020-07-30 07:14:10 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
:100755 000000 $newf $zero D file3/newf
|
|
|
|
:100644 000000 $oldf $zero D file3/oldf
|
2010-10-10 11:30:15 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
root=$(git rev-parse refs/heads/branch^0^{tree}) &&
|
|
|
|
cat >input <<-INPUT_END &&
|
2010-10-10 11:30:15 +08:00
|
|
|
commit refs/heads/N6
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy root directory by tree hash
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
M 040000 $root ""
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2010-10-10 11:30:15 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'N: copy root by path' '
|
2020-07-30 07:14:10 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
:100755 100755 $newf $newf C100 file2/newf oldroot/file2/newf
|
|
|
|
:100644 100644 $oldf $oldf C100 file2/oldf oldroot/file2/oldf
|
|
|
|
:100755 100755 $f4id $f4id C100 file4 oldroot/file4
|
|
|
|
:100755 100755 $f6id $f6id C100 newdir/exec.sh oldroot/newdir/exec.sh
|
|
|
|
:100644 100644 $f5id $f5id C100 newdir/interesting oldroot/newdir/interesting
|
2013-06-23 22:58:19 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
2013-06-23 22:58:19 +08:00
|
|
|
commit refs/heads/N-copy-root-path
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy root directory by (empty) path
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
C "" oldroot
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -C --find-copies-harder -r branch N-copy-root-path >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
2013-06-23 22:58:19 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'N: delete directory by copying' '
|
|
|
|
cat >expect <<-\EOF &&
|
2011-01-27 14:07:49 +08:00
|
|
|
OBJID
|
|
|
|
:100644 000000 OBJID OBJID D foo/bar/qux
|
|
|
|
OBJID
|
|
|
|
:000000 100644 OBJID OBJID A foo/bar/baz
|
|
|
|
:000000 100644 OBJID OBJID A foo/bar/qux
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
empty_tree=$(git mktree </dev/null) &&
|
|
|
|
cat >input <<-INPUT_END &&
|
2011-01-27 14:07:49 +08:00
|
|
|
commit refs/heads/N-delete
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
collect data to be deleted
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
deleteall
|
|
|
|
M 100644 inline foo/bar/baz
|
|
|
|
data <<DATA_END
|
|
|
|
hello
|
|
|
|
DATA_END
|
|
|
|
C "foo/bar/baz" "foo/bar/qux"
|
|
|
|
C "foo/bar/baz" "foo/bar/quux/1"
|
|
|
|
C "foo/bar/baz" "foo/bar/quuux"
|
|
|
|
M 040000 $empty_tree foo/bar/quux
|
|
|
|
M 040000 $empty_tree foo/bar/quuux
|
|
|
|
|
|
|
|
commit refs/heads/N-delete
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
delete subdirectory
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 040000 $empty_tree foo/bar/qux
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git rev-list N-delete |
|
2011-01-27 14:07:49 +08:00
|
|
|
git diff-tree -r --stdin --root --always |
|
2018-05-13 10:24:15 +08:00
|
|
|
sed -e "s/$OID_REGEX/OBJID/g" >actual &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2011-01-27 14:07:49 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'N: modify copied tree' '
|
2020-07-30 07:14:10 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
:100644 100644 $f5id $f5id C100 newdir/interesting file3/file5
|
|
|
|
:100755 100755 $newf $newf C100 file2/newf file3/newf
|
|
|
|
:100644 100644 $oldf $oldf C100 file2/oldf file3/oldf
|
2010-07-01 11:18:19 +08:00
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
subdir=$(git rev-parse refs/heads/branch^0:file2) &&
|
|
|
|
cat >input <<-INPUT_END &&
|
2010-07-01 11:18:19 +08:00
|
|
|
commit refs/heads/N5
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy by tree hash
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
M 040000 $subdir file3
|
|
|
|
|
|
|
|
commit refs/heads/N5
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
modify directory copy
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 644 inline file3/file5
|
|
|
|
data <<EOF
|
|
|
|
$file5_data
|
|
|
|
EOF
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'N: reject foo/ syntax' '
|
|
|
|
subdir=$(git rev-parse refs/heads/branch^0:file2) &&
|
|
|
|
test_must_fail git fast-import <<-INPUT_END
|
fast-import: tighten M 040000 syntax
When tree_content_set() is asked to modify the path "foo/bar/",
it first recurses like so:
tree_content_set(root, "foo/bar/", sha1, S_IFDIR) ->
tree_content_set(root:foo, "bar/", ...) ->
tree_content_set(root:foo/bar, "", ...)
And as a side-effect of 2794ad5 (fast-import: Allow filemodify to set
the root, 2010-10-10), this last call is accepted and changes
the tree entry for root:foo/bar to refer to the specified tree.
That seems safe enough but let's reject the new syntax (we never meant
to support it) and make it harder for frontends to introduce pointless
incompatibilities with git fast-import 1.7.3.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-18 09:08:53 +08:00
|
|
|
commit refs/heads/N5B
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy with invalid syntax
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
M 040000 $subdir file3/
|
2015-11-20 03:09:43 +08:00
|
|
|
INPUT_END
|
|
|
|
'
|
fast-import: tighten M 040000 syntax
When tree_content_set() is asked to modify the path "foo/bar/",
it first recurses like so:
tree_content_set(root, "foo/bar/", sha1, S_IFDIR) ->
tree_content_set(root:foo, "bar/", ...) ->
tree_content_set(root:foo/bar, "", ...)
And as a side-effect of 2794ad5 (fast-import: Allow filemodify to set
the root, 2010-10-10), this last call is accepted and changes
the tree entry for root:foo/bar to refer to the specified tree.
That seems safe enough but let's reject the new syntax (we never meant
to support it) and make it harder for frontends to introduce pointless
incompatibilities with git fast-import 1.7.3.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-18 09:08:53 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'N: reject foo/ syntax in copy source' '
|
|
|
|
test_must_fail git fast-import <<-INPUT_END
|
2012-03-10 12:07:22 +08:00
|
|
|
commit refs/heads/N5C
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy with invalid syntax
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
C file2/ file3
|
2015-11-20 03:09:43 +08:00
|
|
|
INPUT_END
|
|
|
|
'
|
2012-03-10 12:07:22 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'N: reject foo/ syntax in rename source' '
|
|
|
|
test_must_fail git fast-import <<-INPUT_END
|
2012-03-10 12:07:22 +08:00
|
|
|
commit refs/heads/N5D
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
rename with invalid syntax
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
R file2/ file3
|
2015-11-20 03:09:43 +08:00
|
|
|
INPUT_END
|
|
|
|
'
|
2012-03-10 12:07:22 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'N: reject foo/ syntax in ls argument' '
|
|
|
|
test_must_fail git fast-import <<-INPUT_END
|
2012-03-10 12:07:22 +08:00
|
|
|
commit refs/heads/N5E
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy with invalid syntax
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/branch^0
|
|
|
|
ls "file2/"
|
2015-11-20 03:09:43 +08:00
|
|
|
INPUT_END
|
|
|
|
'
|
2012-03-10 12:07:22 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'N: copy to root by id and modify' '
|
|
|
|
echo "hello, world" >expect.foo &&
|
|
|
|
echo hello >expect.bar &&
|
|
|
|
git fast-import <<-SETUP_END &&
|
2010-10-18 09:03:38 +08:00
|
|
|
commit refs/heads/N7
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
hello, tree
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
deleteall
|
|
|
|
M 644 inline foo/bar
|
|
|
|
data <<EOF
|
|
|
|
hello
|
|
|
|
EOF
|
|
|
|
SETUP_END
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
tree=$(git rev-parse --verify N7:) &&
|
|
|
|
git fast-import <<-INPUT_END &&
|
2010-10-18 09:03:38 +08:00
|
|
|
commit refs/heads/N8
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy to root by id and modify
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 040000 $tree ""
|
|
|
|
M 644 inline foo/foo
|
|
|
|
data <<EOF
|
|
|
|
hello, world
|
|
|
|
EOF
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git show N8:foo/foo >actual.foo &&
|
|
|
|
git show N8:foo/bar >actual.bar &&
|
|
|
|
test_cmp expect.foo actual.foo &&
|
|
|
|
test_cmp expect.bar actual.bar
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'N: extract subtree' '
|
|
|
|
branch=$(git rev-parse --verify refs/heads/branch^{tree}) &&
|
|
|
|
cat >input <<-INPUT_END &&
|
fast-import: tighten M 040000 syntax
When tree_content_set() is asked to modify the path "foo/bar/",
it first recurses like so:
tree_content_set(root, "foo/bar/", sha1, S_IFDIR) ->
tree_content_set(root:foo, "bar/", ...) ->
tree_content_set(root:foo/bar, "", ...)
And as a side-effect of 2794ad5 (fast-import: Allow filemodify to set
the root, 2010-10-10), this last call is accepted and changes
the tree entry for root:foo/bar to refer to the specified tree.
That seems safe enough but let's reject the new syntax (we never meant
to support it) and make it harder for frontends to introduce pointless
incompatibilities with git fast-import 1.7.3.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-18 09:08:53 +08:00
|
|
|
commit refs/heads/N9
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
extract subtree branch:newdir
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 040000 $branch ""
|
2010-10-18 09:44:04 +08:00
|
|
|
C "newdir" ""
|
fast-import: tighten M 040000 syntax
When tree_content_set() is asked to modify the path "foo/bar/",
it first recurses like so:
tree_content_set(root, "foo/bar/", sha1, S_IFDIR) ->
tree_content_set(root:foo, "bar/", ...) ->
tree_content_set(root:foo/bar, "", ...)
And as a side-effect of 2794ad5 (fast-import: Allow filemodify to set
the root, 2010-10-10), this last call is accepted and changes
the tree entry for root:foo/bar to refer to the specified tree.
That seems safe enough but let's reject the new syntax (we never meant
to support it) and make it harder for frontends to introduce pointless
incompatibilities with git fast-import 1.7.3.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-18 09:08:53 +08:00
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git diff --exit-code branch:newdir N9
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'N: modify subtree, extract it, and modify again' '
|
|
|
|
echo hello >expect.baz &&
|
|
|
|
echo hello, world >expect.qux &&
|
|
|
|
git fast-import <<-SETUP_END &&
|
2010-10-18 09:44:04 +08:00
|
|
|
commit refs/heads/N10
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
hello, tree
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
deleteall
|
|
|
|
M 644 inline foo/bar/baz
|
|
|
|
data <<EOF
|
|
|
|
hello
|
|
|
|
EOF
|
|
|
|
SETUP_END
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
tree=$(git rev-parse --verify N10:) &&
|
|
|
|
git fast-import <<-INPUT_END &&
|
2010-10-18 09:44:04 +08:00
|
|
|
commit refs/heads/N11
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy to root by id and modify
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 040000 $tree ""
|
|
|
|
M 100644 inline foo/bar/qux
|
|
|
|
data <<EOF
|
|
|
|
hello, world
|
|
|
|
EOF
|
|
|
|
R "foo" ""
|
|
|
|
C "bar/qux" "bar/quux"
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git show N11:bar/baz >actual.baz &&
|
|
|
|
git show N11:bar/qux >actual.qux &&
|
|
|
|
git show N11:bar/quux >actual.quux &&
|
|
|
|
test_cmp expect.baz actual.baz &&
|
|
|
|
test_cmp expect.qux actual.qux &&
|
|
|
|
test_cmp expect.qux actual.quux'
|
2010-10-18 09:44:04 +08:00
|
|
|
|
2007-08-01 12:05:15 +08:00
|
|
|
###
|
|
|
|
### series O
|
|
|
|
###
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'O: comments are all skipped' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
#we will
|
|
|
|
commit refs/heads/O1
|
|
|
|
# -- ignore all of this text
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
dirty directory copy
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
# do not forget the import blank line!
|
|
|
|
#
|
|
|
|
# yes, we started from our usual base of branch^0.
|
|
|
|
# i like branch^0.
|
|
|
|
from refs/heads/branch^0
|
|
|
|
# and we need to reuse file2/file5 from N3 above.
|
|
|
|
M 644 inline file2/file5
|
|
|
|
# otherwise the tree will be different
|
|
|
|
data <<EOF
|
|
|
|
$file5_data
|
|
|
|
EOF
|
2007-08-01 12:05:15 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
# do not forget to copy file2 to file3
|
|
|
|
C file2 file3
|
|
|
|
#
|
|
|
|
# or to delete file5 from file2.
|
|
|
|
D file2/file5
|
|
|
|
# are we done yet?
|
|
|
|
|
|
|
|
INPUT_END
|
2007-08-01 12:05:15 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
2016-01-12 19:49:35 +08:00
|
|
|
test $(git rev-parse N3) = $(git rev-parse O1)
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-08-01 12:05:15 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'O: blank lines not necessary after data commands' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/O2
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
dirty directory copy
|
|
|
|
COMMIT
|
|
|
|
from refs/heads/branch^0
|
|
|
|
M 644 inline file2/file5
|
|
|
|
data <<EOF
|
|
|
|
$file5_data
|
|
|
|
EOF
|
|
|
|
C file2 file3
|
|
|
|
D file2/file5
|
2007-08-01 12:24:25 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2007-08-01 12:24:25 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
2016-01-12 19:49:35 +08:00
|
|
|
test $(git rev-parse N3) = $(git rev-parse O2)
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2007-08-01 12:24:25 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'O: repack before next test' '
|
|
|
|
git repack -a -d
|
|
|
|
'
|
2007-08-01 14:22:53 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'O: blank lines not necessary after other commands' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/O3
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
zstring
|
|
|
|
COMMIT
|
|
|
|
commit refs/heads/O3
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
zof
|
|
|
|
COMMIT
|
|
|
|
checkpoint
|
|
|
|
commit refs/heads/O3
|
|
|
|
mark :5
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
zempty
|
|
|
|
COMMIT
|
|
|
|
checkpoint
|
|
|
|
commit refs/heads/O3
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
zcommits
|
|
|
|
COMMIT
|
|
|
|
reset refs/tags/O3-2nd
|
|
|
|
from :5
|
|
|
|
reset refs/tags/O3-3rd
|
|
|
|
from :5
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
cat >expect <<-INPUT_END &&
|
|
|
|
string
|
|
|
|
of
|
|
|
|
empty
|
|
|
|
commits
|
|
|
|
INPUT_END
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
2021-01-26 07:37:38 +08:00
|
|
|
ls -la .git/objects/pack/pack-*.pack >packlist &&
|
|
|
|
ls -la .git/objects/pack/pack-*.pack >idxlist &&
|
|
|
|
test_line_count = 4 idxlist &&
|
|
|
|
test_line_count = 4 packlist &&
|
2016-01-12 19:49:35 +08:00
|
|
|
test $(git rev-parse refs/tags/O3-2nd) = $(git rev-parse O3^) &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-08-01 14:22:53 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'O: progress outputs as requested by input' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/O4
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
zstring
|
|
|
|
COMMIT
|
|
|
|
commit refs/heads/O4
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
zof
|
|
|
|
COMMIT
|
|
|
|
progress Two commits down, 2 to go!
|
|
|
|
commit refs/heads/O4
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
zempty
|
|
|
|
COMMIT
|
|
|
|
progress Three commits down, 1 to go!
|
|
|
|
commit refs/heads/O4
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
zcommits
|
|
|
|
COMMIT
|
|
|
|
progress done!
|
|
|
|
INPUT_END
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input >actual &&
|
|
|
|
grep "progress " <input >expect &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2007-08-01 22:23:08 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
###
|
|
|
|
### series P (gitlinks)
|
|
|
|
###
|
|
|
|
|
|
|
|
test_expect_success 'P: superproject & submodule mix' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data 10
|
|
|
|
test file
|
|
|
|
|
|
|
|
reset refs/heads/sub
|
|
|
|
commit refs/heads/sub
|
|
|
|
mark :2
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data 12
|
|
|
|
sub_initial
|
|
|
|
M 100644 :1 file
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :3
|
|
|
|
data <<DATAEND
|
|
|
|
[submodule "sub"]
|
|
|
|
path = sub
|
2016-01-12 19:49:35 +08:00
|
|
|
url = "$(pwd)/sub"
|
2015-11-20 03:09:49 +08:00
|
|
|
DATAEND
|
|
|
|
|
|
|
|
commit refs/heads/subuse1
|
|
|
|
mark :4
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data 8
|
|
|
|
initial
|
2020-11-19 07:44:42 +08:00
|
|
|
from refs/heads/main
|
2015-11-20 03:09:49 +08:00
|
|
|
M 100644 :3 .gitmodules
|
|
|
|
M 160000 :2 sub
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :5
|
|
|
|
data 20
|
|
|
|
test file
|
|
|
|
more data
|
|
|
|
|
|
|
|
commit refs/heads/sub
|
|
|
|
mark :6
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data 11
|
|
|
|
sub_second
|
|
|
|
from :2
|
|
|
|
M 100644 :5 file
|
|
|
|
|
|
|
|
commit refs/heads/subuse1
|
|
|
|
mark :7
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data 7
|
|
|
|
second
|
|
|
|
from :4
|
|
|
|
M 160000 :6 sub
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
git fast-import <input &&
|
|
|
|
git checkout subuse1 &&
|
|
|
|
rm -rf sub &&
|
|
|
|
mkdir sub &&
|
|
|
|
(
|
|
|
|
cd sub &&
|
|
|
|
git init &&
|
2020-11-19 07:44:42 +08:00
|
|
|
git fetch --update-head-ok .. refs/heads/sub:refs/heads/main &&
|
|
|
|
git checkout main
|
2015-11-20 03:09:49 +08:00
|
|
|
) &&
|
|
|
|
git submodule init &&
|
|
|
|
git submodule update
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'P: verbatim SHA gitlinks' '
|
|
|
|
SUBLAST=$(git rev-parse --verify sub) &&
|
|
|
|
SUBPREV=$(git rev-parse --verify sub^) &&
|
|
|
|
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data <<DATAEND
|
|
|
|
[submodule "sub"]
|
|
|
|
path = sub
|
2016-01-12 19:49:35 +08:00
|
|
|
url = "$(pwd)/sub"
|
2015-11-20 03:09:49 +08:00
|
|
|
DATAEND
|
|
|
|
|
|
|
|
commit refs/heads/subuse2
|
|
|
|
mark :2
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data 8
|
|
|
|
initial
|
2020-11-19 07:44:42 +08:00
|
|
|
from refs/heads/main
|
2015-11-20 03:09:49 +08:00
|
|
|
M 100644 :1 .gitmodules
|
|
|
|
M 160000 $SUBPREV sub
|
|
|
|
|
|
|
|
commit refs/heads/subuse2
|
|
|
|
mark :3
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data 7
|
|
|
|
second
|
|
|
|
from :2
|
|
|
|
M 160000 $SUBLAST sub
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
git branch -D sub &&
|
t/t9300-fast-import.sh: prepare for `gc --cruft` by default
In a similar fashion as previous commits, adjust the fast-import tests
to prepare for "git gc" generating a cruft pack by default.
This adjustment is slightly different, however. Instead of relying on us
writing out the objects loose, and then calling `git prune` to remove
them, t9300 needs to be prepared to drop objects that would be moved
into cruft packs.
To do this, we can combine the `git gc` invocation with `git prune` into
one `git gc --prune`, which handles pruning both loose objects, and
objects that would otherwise be written to a cruft pack.
Likely this pattern of "git gc && git prune" started all the way back in
03db4525d3 (Support gitlinks in fast-import., 2008-07-19), which
happened after deprecating `git gc --prune` in 9e7d501990 (builtin-gc.c:
deprecate --prune, it now really has no effect, 2008-05-09).
After `--prune` was un-deprecated in 58e9d9d472 (gc: make --prune useful
again by accepting an optional parameter, 2009-02-14), this script got a
handful of new "git gc && git prune" instances via via 4cedb78cb5
(fast-import: add input format tests, 2011-08-11). These could have been
`git gc --prune`, but weren't (likely taking after 03db4525d3).
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-04-19 04:40:52 +08:00
|
|
|
git gc --prune=now &&
|
2015-11-20 03:09:49 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'P: fail on inline gitlink' '
|
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/subuse3
|
|
|
|
mark :1
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
corrupt
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/subuse2
|
|
|
|
M 160000 inline sub
|
|
|
|
data <<DATA
|
|
|
|
$SUBPREV
|
|
|
|
DATA
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'P: fail on blob mark in gitlink' '
|
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data <<DATA
|
|
|
|
$SUBPREV
|
|
|
|
DATA
|
|
|
|
|
|
|
|
commit refs/heads/subuse3
|
|
|
|
mark :2
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
corrupt
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
from refs/heads/subuse2
|
|
|
|
M 160000 :1 sub
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
|
|
|
###
|
|
|
|
### series Q (notes)
|
|
|
|
###
|
|
|
|
|
|
|
|
test_expect_success 'Q: commit notes' '
|
|
|
|
note1_data="The first note for the first commit" &&
|
|
|
|
note2_data="The first note for the second commit" &&
|
|
|
|
note3_data="The first note for the third commit" &&
|
|
|
|
note1b_data="The second note for the first commit" &&
|
|
|
|
note1c_data="The third note for the first commit" &&
|
|
|
|
note2b_data="The second note for the second commit" &&
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
blob
|
|
|
|
mark :2
|
|
|
|
data <<EOF
|
|
|
|
$file2_data
|
|
|
|
EOF
|
|
|
|
|
|
|
|
commit refs/heads/notes-test
|
|
|
|
mark :3
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
first (:3)
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 644 :2 file2
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
blob
|
|
|
|
mark :4
|
|
|
|
data $file4_len
|
|
|
|
$file4_data
|
|
|
|
commit refs/heads/notes-test
|
|
|
|
mark :5
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
second (:5)
|
|
|
|
COMMIT
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
M 644 :4 file4
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/heads/notes-test
|
|
|
|
mark :6
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
third (:6)
|
|
|
|
COMMIT
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
M 644 inline file5
|
|
|
|
data <<EOF
|
|
|
|
$file5_data
|
|
|
|
EOF
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
M 755 inline file6
|
|
|
|
data <<EOF
|
|
|
|
$file6_data
|
|
|
|
EOF
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
blob
|
|
|
|
mark :7
|
|
|
|
data <<EOF
|
|
|
|
$note1_data
|
|
|
|
EOF
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
blob
|
|
|
|
mark :8
|
|
|
|
data <<EOF
|
|
|
|
$note2_data
|
|
|
|
EOF
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/notes/foobar
|
|
|
|
mark :9
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
notes (:9)
|
|
|
|
COMMIT
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
N :7 :3
|
|
|
|
N :8 :5
|
|
|
|
N inline :6
|
|
|
|
data <<EOF
|
|
|
|
$note3_data
|
|
|
|
EOF
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/notes/foobar
|
|
|
|
mark :10
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
notes (:10)
|
|
|
|
COMMIT
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
N inline :3
|
|
|
|
data <<EOF
|
|
|
|
$note1b_data
|
|
|
|
EOF
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/notes/foobar2
|
|
|
|
mark :11
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
notes (:11)
|
|
|
|
COMMIT
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
N inline :3
|
|
|
|
data <<EOF
|
|
|
|
$note1c_data
|
|
|
|
EOF
|
2008-07-19 20:21:24 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/notes/foobar
|
|
|
|
mark :12
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
notes (:12)
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
deleteall
|
|
|
|
N inline :5
|
|
|
|
data <<EOF
|
|
|
|
$note2b_data
|
|
|
|
EOF
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input &&
|
|
|
|
git whatchanged notes-test
|
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'Q: verify pack' '
|
|
|
|
verify_packs
|
|
|
|
'
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'Q: verify first commit' '
|
|
|
|
commit1=$(git rev-parse notes-test~2) &&
|
|
|
|
commit2=$(git rev-parse notes-test^) &&
|
|
|
|
commit3=$(git rev-parse notes-test) &&
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
first (:3)
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit notes-test~2 | sed 1d >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify second commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
parent $commit1
|
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
second (:5)
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit notes-test^ | sed 1d >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify third commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
parent $commit2
|
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
third (:6)
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit notes-test | sed 1d >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify first notes commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
notes (:9)
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify first notes tree' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect.unsorted <<-EOF &&
|
|
|
|
100644 blob $commit1
|
|
|
|
100644 blob $commit2
|
|
|
|
100644 blob $commit3
|
|
|
|
EOF
|
|
|
|
cat expect.unsorted | sort >expect &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify first note for first commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$note1_data" >expect &&
|
2015-11-20 03:09:46 +08:00
|
|
|
git cat-file blob refs/notes/foobar~2:$commit1 >actual &&
|
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify first note for second commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$note2_data" >expect &&
|
2015-11-20 03:09:46 +08:00
|
|
|
git cat-file blob refs/notes/foobar~2:$commit2 >actual &&
|
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify first note for third commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$note3_data" >expect &&
|
2015-11-20 03:09:46 +08:00
|
|
|
git cat-file blob refs/notes/foobar~2:$commit3 >actual &&
|
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify second notes commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2016-01-12 19:49:35 +08:00
|
|
|
parent $(git rev-parse --verify refs/notes/foobar~2)
|
2015-11-20 03:09:49 +08:00
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
notes (:10)
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify second notes tree' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect.unsorted <<-EOF &&
|
|
|
|
100644 blob $commit1
|
|
|
|
100644 blob $commit2
|
|
|
|
100644 blob $commit3
|
|
|
|
EOF
|
|
|
|
cat expect.unsorted | sort >expect &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify second note for first commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$note1b_data" >expect &&
|
2015-11-20 03:09:46 +08:00
|
|
|
git cat-file blob refs/notes/foobar^:$commit1 >actual &&
|
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify first note for second commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$note2_data" >expect &&
|
2015-11-20 03:09:46 +08:00
|
|
|
git cat-file blob refs/notes/foobar^:$commit2 >actual &&
|
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify first note for third commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$note3_data" >expect &&
|
2015-11-20 03:09:46 +08:00
|
|
|
git cat-file blob refs/notes/foobar^:$commit3 >actual &&
|
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify third notes commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
notes (:11)
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify third notes tree' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect.unsorted <<-EOF &&
|
|
|
|
100644 blob $commit1
|
|
|
|
EOF
|
|
|
|
cat expect.unsorted | sort >expect &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify third note for first commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$note1c_data" >expect &&
|
2015-11-20 03:09:46 +08:00
|
|
|
git cat-file blob refs/notes/foobar2:$commit1 >actual &&
|
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify fourth notes commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect <<-EOF &&
|
2016-01-12 19:49:35 +08:00
|
|
|
parent $(git rev-parse --verify refs/notes/foobar^)
|
2015-11-20 03:09:49 +08:00
|
|
|
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
|
|
|
|
notes (:12)
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file commit refs/notes/foobar | sed 1d >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify fourth notes tree' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >expect.unsorted <<-EOF &&
|
|
|
|
100644 blob $commit2
|
|
|
|
EOF
|
|
|
|
cat expect.unsorted | sort >expect &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2009-12-07 19:27:24 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'Q: verify second note for second commit' '
|
2015-11-20 03:09:49 +08:00
|
|
|
echo "$note2b_data" >expect &&
|
2015-11-20 03:09:46 +08:00
|
|
|
git cat-file blob refs/notes/foobar:$commit2 >actual &&
|
|
|
|
test_cmp expect actual
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2009-10-09 18:22:02 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'Q: deny note on empty branch' '
|
|
|
|
cat >input <<-EOF &&
|
|
|
|
reset refs/heads/Q0
|
2011-09-23 03:47:05 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
commit refs/heads/note-Q0
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
Note for an empty branch.
|
|
|
|
COMMIT
|
2011-09-23 03:47:05 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
N inline refs/heads/Q0
|
|
|
|
data <<NOTE
|
|
|
|
some note
|
|
|
|
NOTE
|
|
|
|
EOF
|
2015-11-20 03:09:43 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
2009-12-05 01:06:56 +08:00
|
|
|
###
|
2009-12-05 01:06:58 +08:00
|
|
|
### series R (feature and option)
|
2009-12-05 01:06:56 +08:00
|
|
|
###
|
|
|
|
|
|
|
|
test_expect_success 'R: abort on unsupported feature' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
feature no-such-feature-exists
|
|
|
|
EOF
|
|
|
|
|
2009-12-05 01:06:56 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: supported feature is accepted' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
feature date-format=now
|
|
|
|
EOF
|
|
|
|
|
2009-12-05 01:06:56 +08:00
|
|
|
git fast-import <input
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: abort on receiving feature after data command' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
blob
|
|
|
|
data 3
|
|
|
|
hi
|
|
|
|
feature date-format=now
|
|
|
|
EOF
|
|
|
|
|
2009-12-05 01:06:56 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
2019-08-30 03:08:42 +08:00
|
|
|
test_expect_success 'R: import-marks features forbidden by default' '
|
|
|
|
>git.marks &&
|
|
|
|
echo "feature import-marks=git.marks" >input &&
|
|
|
|
test_must_fail git fast-import <input &&
|
|
|
|
echo "feature import-marks-if-exists=git.marks" >input &&
|
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
2009-12-05 01:06:59 +08:00
|
|
|
test_expect_success 'R: only one import-marks feature allowed per stream' '
|
2019-08-30 01:43:23 +08:00
|
|
|
>git.marks &&
|
|
|
|
>git2.marks &&
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
feature import-marks=git.marks
|
|
|
|
feature import-marks=git2.marks
|
|
|
|
EOF
|
|
|
|
|
2019-08-30 03:08:42 +08:00
|
|
|
test_must_fail git fast-import --allow-unsafe-features <input
|
2009-12-05 01:06:59 +08:00
|
|
|
'
|
|
|
|
|
fast-import: disallow "feature export-marks" by default
The fast-import stream command "feature export-marks=<path>" lets the
stream write marks to an arbitrary path. This may be surprising if you
are running fast-import against an untrusted input (which otherwise
cannot do anything except update Git objects and refs).
Let's disallow the use of this feature by default, and provide a
command-line option to re-enable it (you can always just use the
command-line --export-marks as well, but the in-stream version provides
an easy way for exporters to control the process).
This is a backwards-incompatible change, since the default is flipping
to the new, safer behavior. However, since the main users of the
in-stream versions would be import/export-based remote helpers, and
since we trust remote helpers already (which are already running
arbitrary code), we'll pass the new option by default when reading a
remote helper's stream. This should minimize the impact.
Note that the implementation isn't totally simple, as we have to work
around the fact that fast-import doesn't parse its command-line options
until after it has read any "feature" lines from the stream. This is how
it lets command-line options override in-stream. But in our case, it's
important to parse the new --allow-unsafe-features first.
There are three options for resolving this:
1. Do a separate "early" pass over the options. This is easy for us to
do because there are no command-line options that allow the
"unstuck" form (so there's no chance of us mistaking an argument
for an option), though it does introduce a risk of incorrect
parsing later (e.g,. if we convert to parse-options).
2. Move the option parsing phase back to the start of the program, but
teach the stream-reading code never to override an existing value.
This is tricky, because stream "feature" lines override each other
(meaning we'd have to start tracking the source for every option).
3. Accept that we might parse a "feature export-marks" line that is
forbidden, as long we don't _act_ on it until after we've parsed
the command line options.
This would, in fact, work with the current code, but only because
the previous patch fixed the export-marks parser to avoid touching
the filesystem.
So while it works, it does carry risk of somebody getting it wrong
in the future in a rather subtle and unsafe way.
I've gone with option (1) here as simple, safe, and unlikely to cause
regressions.
This fixes CVE-2019-1348.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 02:37:26 +08:00
|
|
|
test_expect_success 'R: export-marks feature forbidden by default' '
|
|
|
|
echo "feature export-marks=git.marks" >input &&
|
2009-12-05 01:06:59 +08:00
|
|
|
test_must_fail git fast-import <input
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'R: export-marks feature results in a marks file being created' '
|
|
|
|
cat >input <<-EOF &&
|
|
|
|
feature export-marks=git.marks
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data 3
|
|
|
|
hi
|
2009-12-05 01:06:56 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2009-12-05 01:06:56 +08:00
|
|
|
|
fast-import: disallow "feature export-marks" by default
The fast-import stream command "feature export-marks=<path>" lets the
stream write marks to an arbitrary path. This may be surprising if you
are running fast-import against an untrusted input (which otherwise
cannot do anything except update Git objects and refs).
Let's disallow the use of this feature by default, and provide a
command-line option to re-enable it (you can always just use the
command-line --export-marks as well, but the in-stream version provides
an easy way for exporters to control the process).
This is a backwards-incompatible change, since the default is flipping
to the new, safer behavior. However, since the main users of the
in-stream versions would be import/export-based remote helpers, and
since we trust remote helpers already (which are already running
arbitrary code), we'll pass the new option by default when reading a
remote helper's stream. This should minimize the impact.
Note that the implementation isn't totally simple, as we have to work
around the fact that fast-import doesn't parse its command-line options
until after it has read any "feature" lines from the stream. This is how
it lets command-line options override in-stream. But in our case, it's
important to parse the new --allow-unsafe-features first.
There are three options for resolving this:
1. Do a separate "early" pass over the options. This is easy for us to
do because there are no command-line options that allow the
"unstuck" form (so there's no chance of us mistaking an argument
for an option), though it does introduce a risk of incorrect
parsing later (e.g,. if we convert to parse-options).
2. Move the option parsing phase back to the start of the program, but
teach the stream-reading code never to override an existing value.
This is tricky, because stream "feature" lines override each other
(meaning we'd have to start tracking the source for every option).
3. Accept that we might parse a "feature export-marks" line that is
forbidden, as long we don't _act_ on it until after we've parsed
the command line options.
This would, in fact, work with the current code, but only because
the previous patch fixed the export-marks parser to avoid touching
the filesystem.
So while it works, it does carry risk of somebody getting it wrong
in the future in a rather subtle and unsafe way.
I've gone with option (1) here as simple, safe, and unlikely to cause
regressions.
This fixes CVE-2019-1348.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 02:37:26 +08:00
|
|
|
git fast-import --allow-unsafe-features <input &&
|
2015-11-20 03:09:43 +08:00
|
|
|
grep :1 git.marks
|
|
|
|
'
|
2009-12-05 01:06:56 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'R: export-marks options can be overridden by commandline options' '
|
fast-import: delay creating leading directories for export-marks
When we parse the --export-marks option, we don't immediately open the
file, but we do create any leading directories. This can be especially
confusing when a command-line option overrides an in-stream one, in
which case we'd create the leading directory for the in-stream file,
even though we never actually write the file.
Let's instead create the directories just before opening the file, which
means we'll create only useful directories. Note that this could change
the handling of relative paths if we chdir() in between, but we don't
actually do so; the only permanent chdir is from setup_git_directory()
which runs before either code path (potentially we should take the
pre-setup dir into account to avoid surprising the user, but that's an
orthogonal change).
The test just adapts the existing "override" test to use paths with
leading directories. This checks both that the correct directory is
created (which worked before but was not tested), and that the
overridden one is not (our new fix here).
While we're here, let's also check the error result of
safe_create_leading_directories(). We'd presumably notice any failure
immediately after when we try to open the file itself, but we can give a
more specific error message in this case.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 01:33:48 +08:00
|
|
|
cat >input <<-\EOF &&
|
|
|
|
feature export-marks=feature-sub/git.marks
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data 3
|
|
|
|
hi
|
|
|
|
|
|
|
|
EOF
|
fast-import: disallow "feature export-marks" by default
The fast-import stream command "feature export-marks=<path>" lets the
stream write marks to an arbitrary path. This may be surprising if you
are running fast-import against an untrusted input (which otherwise
cannot do anything except update Git objects and refs).
Let's disallow the use of this feature by default, and provide a
command-line option to re-enable it (you can always just use the
command-line --export-marks as well, but the in-stream version provides
an easy way for exporters to control the process).
This is a backwards-incompatible change, since the default is flipping
to the new, safer behavior. However, since the main users of the
in-stream versions would be import/export-based remote helpers, and
since we trust remote helpers already (which are already running
arbitrary code), we'll pass the new option by default when reading a
remote helper's stream. This should minimize the impact.
Note that the implementation isn't totally simple, as we have to work
around the fact that fast-import doesn't parse its command-line options
until after it has read any "feature" lines from the stream. This is how
it lets command-line options override in-stream. But in our case, it's
important to parse the new --allow-unsafe-features first.
There are three options for resolving this:
1. Do a separate "early" pass over the options. This is easy for us to
do because there are no command-line options that allow the
"unstuck" form (so there's no chance of us mistaking an argument
for an option), though it does introduce a risk of incorrect
parsing later (e.g,. if we convert to parse-options).
2. Move the option parsing phase back to the start of the program, but
teach the stream-reading code never to override an existing value.
This is tricky, because stream "feature" lines override each other
(meaning we'd have to start tracking the source for every option).
3. Accept that we might parse a "feature export-marks" line that is
forbidden, as long we don't _act_ on it until after we've parsed
the command line options.
This would, in fact, work with the current code, but only because
the previous patch fixed the export-marks parser to avoid touching
the filesystem.
So while it works, it does carry risk of somebody getting it wrong
in the future in a rather subtle and unsafe way.
I've gone with option (1) here as simple, safe, and unlikely to cause
regressions.
This fixes CVE-2019-1348.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 02:37:26 +08:00
|
|
|
git fast-import --allow-unsafe-features \
|
|
|
|
--export-marks=cmdline-sub/other.marks <input &&
|
fast-import: delay creating leading directories for export-marks
When we parse the --export-marks option, we don't immediately open the
file, but we do create any leading directories. This can be especially
confusing when a command-line option overrides an in-stream one, in
which case we'd create the leading directory for the in-stream file,
even though we never actually write the file.
Let's instead create the directories just before opening the file, which
means we'll create only useful directories. Note that this could change
the handling of relative paths if we chdir() in between, but we don't
actually do so; the only permanent chdir is from setup_git_directory()
which runs before either code path (potentially we should take the
pre-setup dir into account to avoid surprising the user, but that's an
orthogonal change).
The test just adapts the existing "override" test to use paths with
leading directories. This checks both that the correct directory is
created (which worked before but was not tested), and that the
overridden one is not (our new fix here).
While we're here, let's also check the error result of
safe_create_leading_directories(). We'd presumably notice any failure
immediately after when we try to open the file itself, but we can give a
more specific error message in this case.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 01:33:48 +08:00
|
|
|
grep :1 cmdline-sub/other.marks &&
|
|
|
|
test_path_is_missing feature-sub
|
2015-11-20 03:09:43 +08:00
|
|
|
'
|
2009-12-05 01:06:56 +08:00
|
|
|
|
2011-01-15 14:31:46 +08:00
|
|
|
test_expect_success 'R: catch typo in marks file name' '
|
|
|
|
test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null &&
|
|
|
|
echo "feature import-marks=nonexistent.marks" |
|
fast-import: disallow "feature export-marks" by default
The fast-import stream command "feature export-marks=<path>" lets the
stream write marks to an arbitrary path. This may be surprising if you
are running fast-import against an untrusted input (which otherwise
cannot do anything except update Git objects and refs).
Let's disallow the use of this feature by default, and provide a
command-line option to re-enable it (you can always just use the
command-line --export-marks as well, but the in-stream version provides
an easy way for exporters to control the process).
This is a backwards-incompatible change, since the default is flipping
to the new, safer behavior. However, since the main users of the
in-stream versions would be import/export-based remote helpers, and
since we trust remote helpers already (which are already running
arbitrary code), we'll pass the new option by default when reading a
remote helper's stream. This should minimize the impact.
Note that the implementation isn't totally simple, as we have to work
around the fact that fast-import doesn't parse its command-line options
until after it has read any "feature" lines from the stream. This is how
it lets command-line options override in-stream. But in our case, it's
important to parse the new --allow-unsafe-features first.
There are three options for resolving this:
1. Do a separate "early" pass over the options. This is easy for us to
do because there are no command-line options that allow the
"unstuck" form (so there's no chance of us mistaking an argument
for an option), though it does introduce a risk of incorrect
parsing later (e.g,. if we convert to parse-options).
2. Move the option parsing phase back to the start of the program, but
teach the stream-reading code never to override an existing value.
This is tricky, because stream "feature" lines override each other
(meaning we'd have to start tracking the source for every option).
3. Accept that we might parse a "feature export-marks" line that is
forbidden, as long we don't _act_ on it until after we've parsed
the command line options.
This would, in fact, work with the current code, but only because
the previous patch fixed the export-marks parser to avoid touching
the filesystem.
So while it works, it does carry risk of somebody getting it wrong
in the future in a rather subtle and unsafe way.
I've gone with option (1) here as simple, safe, and unlikely to cause
regressions.
This fixes CVE-2019-1348.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 02:37:26 +08:00
|
|
|
test_must_fail git fast-import --allow-unsafe-features
|
2011-01-15 14:31:46 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: import and output marks can be the same file' '
|
|
|
|
rm -f io.marks &&
|
|
|
|
blob=$(echo hi | git hash-object --stdin) &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
:1 $blob
|
|
|
|
:2 $blob
|
|
|
|
EOF
|
|
|
|
git fast-import --export-marks=io.marks <<-\EOF &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data 3
|
|
|
|
hi
|
|
|
|
|
|
|
|
EOF
|
|
|
|
git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
|
|
|
|
blob
|
|
|
|
mark :2
|
|
|
|
data 3
|
|
|
|
hi
|
|
|
|
|
|
|
|
EOF
|
|
|
|
test_cmp expect io.marks
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: --import-marks=foo --output-marks=foo to create foo fails' '
|
|
|
|
rm -f io.marks &&
|
|
|
|
test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data 3
|
|
|
|
hi
|
|
|
|
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: --import-marks-if-exists' '
|
|
|
|
rm -f io.marks &&
|
|
|
|
blob=$(echo hi | git hash-object --stdin) &&
|
|
|
|
echo ":1 $blob" >expect &&
|
|
|
|
git fast-import --import-marks-if-exists=io.marks --export-marks=io.marks <<-\EOF &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data 3
|
|
|
|
hi
|
|
|
|
|
|
|
|
EOF
|
|
|
|
test_cmp expect io.marks
|
|
|
|
'
|
|
|
|
|
2011-08-17 18:42:58 +08:00
|
|
|
test_expect_success 'R: feature import-marks-if-exists' '
|
|
|
|
rm -f io.marks &&
|
|
|
|
|
2019-08-30 03:08:42 +08:00
|
|
|
git fast-import --export-marks=io.marks \
|
|
|
|
--allow-unsafe-features <<-\EOF &&
|
2011-08-17 18:42:58 +08:00
|
|
|
feature import-marks-if-exists=not_io.marks
|
|
|
|
EOF
|
2018-07-28 01:48:11 +08:00
|
|
|
test_must_be_empty io.marks &&
|
2011-08-17 18:42:58 +08:00
|
|
|
|
|
|
|
blob=$(echo hi | git hash-object --stdin) &&
|
|
|
|
|
|
|
|
echo ":1 $blob" >io.marks &&
|
|
|
|
echo ":1 $blob" >expect &&
|
|
|
|
echo ":2 $blob" >>expect &&
|
|
|
|
|
2019-08-30 03:08:42 +08:00
|
|
|
git fast-import --export-marks=io.marks \
|
|
|
|
--allow-unsafe-features <<-\EOF &&
|
2011-08-17 18:42:58 +08:00
|
|
|
feature import-marks-if-exists=io.marks
|
|
|
|
blob
|
|
|
|
mark :2
|
|
|
|
data 3
|
|
|
|
hi
|
|
|
|
|
|
|
|
EOF
|
|
|
|
test_cmp expect io.marks &&
|
|
|
|
|
|
|
|
echo ":3 $blob" >>expect &&
|
|
|
|
|
|
|
|
git fast-import --import-marks=io.marks \
|
2019-08-30 03:08:42 +08:00
|
|
|
--export-marks=io.marks \
|
|
|
|
--allow-unsafe-features <<-\EOF &&
|
2011-08-17 18:42:58 +08:00
|
|
|
feature import-marks-if-exists=not_io.marks
|
|
|
|
blob
|
|
|
|
mark :3
|
|
|
|
data 3
|
|
|
|
hi
|
|
|
|
|
|
|
|
EOF
|
|
|
|
test_cmp expect io.marks &&
|
|
|
|
|
|
|
|
git fast-import --import-marks-if-exists=not_io.marks \
|
2019-08-30 03:08:42 +08:00
|
|
|
--export-marks=io.marks \
|
|
|
|
--allow-unsafe-features <<-\EOF &&
|
2011-08-17 18:42:58 +08:00
|
|
|
feature import-marks-if-exists=io.marks
|
|
|
|
EOF
|
2018-07-28 01:48:11 +08:00
|
|
|
test_must_be_empty io.marks
|
2011-08-17 18:42:58 +08:00
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'R: import to output marks works without any content' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
feature import-marks=marks.out
|
|
|
|
feature export-marks=marks.new
|
|
|
|
EOF
|
|
|
|
|
fast-import: disallow "feature export-marks" by default
The fast-import stream command "feature export-marks=<path>" lets the
stream write marks to an arbitrary path. This may be surprising if you
are running fast-import against an untrusted input (which otherwise
cannot do anything except update Git objects and refs).
Let's disallow the use of this feature by default, and provide a
command-line option to re-enable it (you can always just use the
command-line --export-marks as well, but the in-stream version provides
an easy way for exporters to control the process).
This is a backwards-incompatible change, since the default is flipping
to the new, safer behavior. However, since the main users of the
in-stream versions would be import/export-based remote helpers, and
since we trust remote helpers already (which are already running
arbitrary code), we'll pass the new option by default when reading a
remote helper's stream. This should minimize the impact.
Note that the implementation isn't totally simple, as we have to work
around the fact that fast-import doesn't parse its command-line options
until after it has read any "feature" lines from the stream. This is how
it lets command-line options override in-stream. But in our case, it's
important to parse the new --allow-unsafe-features first.
There are three options for resolving this:
1. Do a separate "early" pass over the options. This is easy for us to
do because there are no command-line options that allow the
"unstuck" form (so there's no chance of us mistaking an argument
for an option), though it does introduce a risk of incorrect
parsing later (e.g,. if we convert to parse-options).
2. Move the option parsing phase back to the start of the program, but
teach the stream-reading code never to override an existing value.
This is tricky, because stream "feature" lines override each other
(meaning we'd have to start tracking the source for every option).
3. Accept that we might parse a "feature export-marks" line that is
forbidden, as long we don't _act_ on it until after we've parsed
the command line options.
This would, in fact, work with the current code, but only because
the previous patch fixed the export-marks parser to avoid touching
the filesystem.
So while it works, it does carry risk of somebody getting it wrong
in the future in a rather subtle and unsafe way.
I've gone with option (1) here as simple, safe, and unlikely to cause
regressions.
This fixes CVE-2019-1348.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 02:37:26 +08:00
|
|
|
git fast-import --allow-unsafe-features <input &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp marks.out marks.new
|
|
|
|
'
|
2009-12-05 01:06:56 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'R: import marks prefers commandline marks file over the stream' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
feature import-marks=nonexistent.marks
|
|
|
|
feature export-marks=marks.new
|
|
|
|
EOF
|
|
|
|
|
fast-import: disallow "feature export-marks" by default
The fast-import stream command "feature export-marks=<path>" lets the
stream write marks to an arbitrary path. This may be surprising if you
are running fast-import against an untrusted input (which otherwise
cannot do anything except update Git objects and refs).
Let's disallow the use of this feature by default, and provide a
command-line option to re-enable it (you can always just use the
command-line --export-marks as well, but the in-stream version provides
an easy way for exporters to control the process).
This is a backwards-incompatible change, since the default is flipping
to the new, safer behavior. However, since the main users of the
in-stream versions would be import/export-based remote helpers, and
since we trust remote helpers already (which are already running
arbitrary code), we'll pass the new option by default when reading a
remote helper's stream. This should minimize the impact.
Note that the implementation isn't totally simple, as we have to work
around the fact that fast-import doesn't parse its command-line options
until after it has read any "feature" lines from the stream. This is how
it lets command-line options override in-stream. But in our case, it's
important to parse the new --allow-unsafe-features first.
There are three options for resolving this:
1. Do a separate "early" pass over the options. This is easy for us to
do because there are no command-line options that allow the
"unstuck" form (so there's no chance of us mistaking an argument
for an option), though it does introduce a risk of incorrect
parsing later (e.g,. if we convert to parse-options).
2. Move the option parsing phase back to the start of the program, but
teach the stream-reading code never to override an existing value.
This is tricky, because stream "feature" lines override each other
(meaning we'd have to start tracking the source for every option).
3. Accept that we might parse a "feature export-marks" line that is
forbidden, as long we don't _act_ on it until after we've parsed
the command line options.
This would, in fact, work with the current code, but only because
the previous patch fixed the export-marks parser to avoid touching
the filesystem.
So while it works, it does carry risk of somebody getting it wrong
in the future in a rather subtle and unsafe way.
I've gone with option (1) here as simple, safe, and unlikely to cause
regressions.
This fixes CVE-2019-1348.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 02:37:26 +08:00
|
|
|
git fast-import --import-marks=marks.out --allow-unsafe-features <input &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp marks.out marks.new
|
|
|
|
'
|
2009-12-05 01:06:56 +08:00
|
|
|
|
2009-12-05 01:06:59 +08:00
|
|
|
|
|
|
|
test_expect_success 'R: multiple --import-marks= should be honoured' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
feature import-marks=nonexistent.marks
|
|
|
|
feature export-marks=combined.marks
|
|
|
|
EOF
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
head -n2 marks.out > one.marks &&
|
|
|
|
tail -n +3 marks.out > two.marks &&
|
fast-import: disallow "feature export-marks" by default
The fast-import stream command "feature export-marks=<path>" lets the
stream write marks to an arbitrary path. This may be surprising if you
are running fast-import against an untrusted input (which otherwise
cannot do anything except update Git objects and refs).
Let's disallow the use of this feature by default, and provide a
command-line option to re-enable it (you can always just use the
command-line --export-marks as well, but the in-stream version provides
an easy way for exporters to control the process).
This is a backwards-incompatible change, since the default is flipping
to the new, safer behavior. However, since the main users of the
in-stream versions would be import/export-based remote helpers, and
since we trust remote helpers already (which are already running
arbitrary code), we'll pass the new option by default when reading a
remote helper's stream. This should minimize the impact.
Note that the implementation isn't totally simple, as we have to work
around the fact that fast-import doesn't parse its command-line options
until after it has read any "feature" lines from the stream. This is how
it lets command-line options override in-stream. But in our case, it's
important to parse the new --allow-unsafe-features first.
There are three options for resolving this:
1. Do a separate "early" pass over the options. This is easy for us to
do because there are no command-line options that allow the
"unstuck" form (so there's no chance of us mistaking an argument
for an option), though it does introduce a risk of incorrect
parsing later (e.g,. if we convert to parse-options).
2. Move the option parsing phase back to the start of the program, but
teach the stream-reading code never to override an existing value.
This is tricky, because stream "feature" lines override each other
(meaning we'd have to start tracking the source for every option).
3. Accept that we might parse a "feature export-marks" line that is
forbidden, as long we don't _act_ on it until after we've parsed
the command line options.
This would, in fact, work with the current code, but only because
the previous patch fixed the export-marks parser to avoid touching
the filesystem.
So while it works, it does carry risk of somebody getting it wrong
in the future in a rather subtle and unsafe way.
I've gone with option (1) here as simple, safe, and unlikely to cause
regressions.
This fixes CVE-2019-1348.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 02:37:26 +08:00
|
|
|
git fast-import --import-marks=one.marks --import-marks=two.marks \
|
|
|
|
--allow-unsafe-features <input &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp marks.out combined.marks
|
2009-12-05 01:06:59 +08:00
|
|
|
'
|
|
|
|
|
2009-12-05 01:07:00 +08:00
|
|
|
test_expect_success 'R: feature relative-marks should be honoured' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
feature relative-marks
|
|
|
|
feature import-marks=relative.in
|
|
|
|
feature export-marks=relative.out
|
|
|
|
EOF
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
mkdir -p .git/info/fast-import/ &&
|
|
|
|
cp marks.new .git/info/fast-import/relative.in &&
|
fast-import: disallow "feature export-marks" by default
The fast-import stream command "feature export-marks=<path>" lets the
stream write marks to an arbitrary path. This may be surprising if you
are running fast-import against an untrusted input (which otherwise
cannot do anything except update Git objects and refs).
Let's disallow the use of this feature by default, and provide a
command-line option to re-enable it (you can always just use the
command-line --export-marks as well, but the in-stream version provides
an easy way for exporters to control the process).
This is a backwards-incompatible change, since the default is flipping
to the new, safer behavior. However, since the main users of the
in-stream versions would be import/export-based remote helpers, and
since we trust remote helpers already (which are already running
arbitrary code), we'll pass the new option by default when reading a
remote helper's stream. This should minimize the impact.
Note that the implementation isn't totally simple, as we have to work
around the fact that fast-import doesn't parse its command-line options
until after it has read any "feature" lines from the stream. This is how
it lets command-line options override in-stream. But in our case, it's
important to parse the new --allow-unsafe-features first.
There are three options for resolving this:
1. Do a separate "early" pass over the options. This is easy for us to
do because there are no command-line options that allow the
"unstuck" form (so there's no chance of us mistaking an argument
for an option), though it does introduce a risk of incorrect
parsing later (e.g,. if we convert to parse-options).
2. Move the option parsing phase back to the start of the program, but
teach the stream-reading code never to override an existing value.
This is tricky, because stream "feature" lines override each other
(meaning we'd have to start tracking the source for every option).
3. Accept that we might parse a "feature export-marks" line that is
forbidden, as long we don't _act_ on it until after we've parsed
the command line options.
This would, in fact, work with the current code, but only because
the previous patch fixed the export-marks parser to avoid touching
the filesystem.
So while it works, it does carry risk of somebody getting it wrong
in the future in a rather subtle and unsafe way.
I've gone with option (1) here as simple, safe, and unlikely to cause
regressions.
This fixes CVE-2019-1348.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 02:37:26 +08:00
|
|
|
git fast-import --allow-unsafe-features <input &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp marks.new .git/info/fast-import/relative.out
|
2009-12-05 01:07:00 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: feature no-relative-marks should be honoured' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
feature relative-marks
|
|
|
|
feature import-marks=relative.in
|
|
|
|
feature no-relative-marks
|
|
|
|
feature export-marks=non-relative.out
|
|
|
|
EOF
|
|
|
|
|
fast-import: disallow "feature export-marks" by default
The fast-import stream command "feature export-marks=<path>" lets the
stream write marks to an arbitrary path. This may be surprising if you
are running fast-import against an untrusted input (which otherwise
cannot do anything except update Git objects and refs).
Let's disallow the use of this feature by default, and provide a
command-line option to re-enable it (you can always just use the
command-line --export-marks as well, but the in-stream version provides
an easy way for exporters to control the process).
This is a backwards-incompatible change, since the default is flipping
to the new, safer behavior. However, since the main users of the
in-stream versions would be import/export-based remote helpers, and
since we trust remote helpers already (which are already running
arbitrary code), we'll pass the new option by default when reading a
remote helper's stream. This should minimize the impact.
Note that the implementation isn't totally simple, as we have to work
around the fact that fast-import doesn't parse its command-line options
until after it has read any "feature" lines from the stream. This is how
it lets command-line options override in-stream. But in our case, it's
important to parse the new --allow-unsafe-features first.
There are three options for resolving this:
1. Do a separate "early" pass over the options. This is easy for us to
do because there are no command-line options that allow the
"unstuck" form (so there's no chance of us mistaking an argument
for an option), though it does introduce a risk of incorrect
parsing later (e.g,. if we convert to parse-options).
2. Move the option parsing phase back to the start of the program, but
teach the stream-reading code never to override an existing value.
This is tricky, because stream "feature" lines override each other
(meaning we'd have to start tracking the source for every option).
3. Accept that we might parse a "feature export-marks" line that is
forbidden, as long we don't _act_ on it until after we've parsed
the command line options.
This would, in fact, work with the current code, but only because
the previous patch fixed the export-marks parser to avoid touching
the filesystem.
So while it works, it does carry risk of somebody getting it wrong
in the future in a rather subtle and unsafe way.
I've gone with option (1) here as simple, safe, and unlikely to cause
regressions.
This fixes CVE-2019-1348.
Signed-off-by: Jeff King <peff@peff.net>
2019-08-30 02:37:26 +08:00
|
|
|
git fast-import --allow-unsafe-features <input &&
|
2015-11-20 03:09:43 +08:00
|
|
|
test_cmp marks.new non-relative.out
|
2009-12-05 01:07:00 +08:00
|
|
|
'
|
|
|
|
|
fast-import: add 'ls' command
Lazy fast-import frontend authors that want to rely on the backend to
keep track of the content of the imported trees _almost_ have what
they need in the 'cat-blob' command (v1.7.4-rc0~30^2~3, 2010-11-28).
But it is not quite enough, since
(1) cat-blob can be used to retrieve the content of files, but
not their mode, and
(2) using cat-blob requires the frontend to keep track of a name
(mark number or object id) for each blob to be retrieved
Introduce an 'ls' command to complement cat-blob and take care of the
remaining needs. The 'ls' command finds what is at a given path
within a given tree-ish (tag, commit, or tree):
'ls' SP <dataref> SP <path> LF
or in fast-import's active commit:
'ls' SP <path> LF
The response is a single line sent through the cat-blob channel,
imitating ls-tree output. So for example:
FE> ls :1 Documentation
gfi> 040000 tree 9e6c2b599341d28a2a375f8207507e0a2a627fe9 Documentation
FE> ls 9e6c2b599341d28a2a375f8207507e0a2a627fe9 git-fast-import.txt
gfi> 100644 blob 4f92954396e3f0f97e75b6838a5635b583708870 git-fast-import.txt
FE> ls :1 RelNotes
gfi> 120000 blob b942e499449d97aeb50c73ca2bdc1c6e6d528743 RelNotes
FE> cat-blob b942e499449d97aeb50c73ca2bdc1c6e6d528743
gfi> b942e499449d97aeb50c73ca2bdc1c6e6d528743 blob 32
gfi> Documentation/RelNotes/1.7.4.txt
The most interesting parts of the reply are the first word, which is
a 6-digit octal mode (regular file, executable, symlink, directory,
or submodule), and the part from the second space to the tab, which is
a <dataref> that can be used in later cat-blob, ls, and filemodify (M)
commands to refer to the content (blob, tree, or commit) at that path.
If there is nothing there, the response is "missing some/path".
The intent is for this command to be used to read files from the
active commit, so a frontend can apply patches to them, and to copy
files and directories from previous revisions.
For example, proposed updates to svn-fe use this command in place of
its internal representation of the repository directory structure.
This simplifies the frontend a great deal and means support for
resuming an import in a separate fast-import run (i.e., incremental
import) is basically free.
Signed-off-by: David Barr <david.barr@cordelta.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Improved-by: Junio C Hamano <gitster@pobox.com>
Improved-by: Sverre Rabbelier <srabbelier@gmail.com>
2010-12-02 18:40:20 +08:00
|
|
|
test_expect_success 'R: feature ls supported' '
|
|
|
|
echo "feature ls" |
|
|
|
|
git fast-import
|
|
|
|
'
|
|
|
|
|
2010-11-29 03:45:01 +08:00
|
|
|
test_expect_success 'R: feature cat-blob supported' '
|
|
|
|
echo "feature cat-blob" |
|
|
|
|
git fast-import
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: cat-blob-fd must be a nonnegative integer' '
|
|
|
|
test_must_fail git fast-import --cat-blob-fd=-1 </dev/null
|
|
|
|
'
|
|
|
|
|
2014-07-22 06:09:27 +08:00
|
|
|
test_expect_success !MINGW 'R: print old blob' '
|
2010-11-29 03:45:01 +08:00
|
|
|
blob=$(echo "yes it can" | git hash-object -w --stdin) &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
${blob} blob 11
|
|
|
|
yes it can
|
|
|
|
|
|
|
|
EOF
|
|
|
|
echo "cat-blob $blob" |
|
|
|
|
git fast-import --cat-blob-fd=6 6>actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2014-07-22 06:09:27 +08:00
|
|
|
test_expect_success !MINGW 'R: in-stream cat-blob-fd not respected' '
|
2010-11-29 03:45:01 +08:00
|
|
|
echo hello >greeting &&
|
|
|
|
blob=$(git hash-object -w greeting) &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
${blob} blob 6
|
|
|
|
hello
|
|
|
|
|
|
|
|
EOF
|
|
|
|
git fast-import --cat-blob-fd=3 3>actual.3 >actual.1 <<-EOF &&
|
|
|
|
cat-blob $blob
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual.3 &&
|
2015-11-20 03:09:45 +08:00
|
|
|
test_must_be_empty actual.1 &&
|
2010-11-29 03:45:01 +08:00
|
|
|
git fast-import 3>actual.3 >actual.1 <<-EOF &&
|
|
|
|
option cat-blob-fd=3
|
|
|
|
cat-blob $blob
|
|
|
|
EOF
|
2015-11-20 03:09:45 +08:00
|
|
|
test_must_be_empty actual.3 &&
|
2010-11-29 03:45:01 +08:00
|
|
|
test_cmp expect actual.1
|
|
|
|
'
|
|
|
|
|
2015-07-01 23:05:58 +08:00
|
|
|
test_expect_success !MINGW 'R: print mark for new blob' '
|
|
|
|
echo "effluentish" | git hash-object --stdin >expect &&
|
|
|
|
git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data <<BLOB_END
|
|
|
|
effluentish
|
|
|
|
BLOB_END
|
|
|
|
get-mark :1
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2014-07-22 06:09:27 +08:00
|
|
|
test_expect_success !MINGW 'R: print new blob' '
|
2010-11-29 03:45:01 +08:00
|
|
|
blob=$(echo "yep yep yep" | git hash-object --stdin) &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
${blob} blob 12
|
|
|
|
yep yep yep
|
|
|
|
|
|
|
|
EOF
|
|
|
|
git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data <<BLOB_END
|
|
|
|
yep yep yep
|
|
|
|
BLOB_END
|
|
|
|
cat-blob :1
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2014-07-22 06:09:27 +08:00
|
|
|
test_expect_success !MINGW 'R: print new blob by sha1' '
|
2010-11-29 03:45:01 +08:00
|
|
|
blob=$(echo "a new blob named by sha1" | git hash-object --stdin) &&
|
|
|
|
cat >expect <<-EOF &&
|
|
|
|
${blob} blob 25
|
|
|
|
a new blob named by sha1
|
|
|
|
|
|
|
|
EOF
|
|
|
|
git fast-import --cat-blob-fd=6 6>actual <<-EOF &&
|
|
|
|
blob
|
|
|
|
data <<BLOB_END
|
|
|
|
a new blob named by sha1
|
|
|
|
BLOB_END
|
|
|
|
cat-blob $blob
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'setup: big file' '
|
|
|
|
(
|
|
|
|
echo "the quick brown fox jumps over the lazy dog" >big &&
|
|
|
|
for i in 1 2 3
|
|
|
|
do
|
|
|
|
cat big big big big >bigger &&
|
|
|
|
cat bigger bigger bigger bigger >big ||
|
|
|
|
exit
|
|
|
|
done
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: print two blobs to stdout' '
|
|
|
|
blob1=$(git hash-object big) &&
|
|
|
|
blob1_len=$(wc -c <big) &&
|
|
|
|
blob2=$(echo hello | git hash-object --stdin) &&
|
|
|
|
{
|
|
|
|
echo ${blob1} blob $blob1_len &&
|
|
|
|
cat big &&
|
|
|
|
cat <<-EOF
|
|
|
|
|
|
|
|
${blob2} blob 6
|
|
|
|
hello
|
|
|
|
|
|
|
|
EOF
|
|
|
|
} >expect &&
|
|
|
|
{
|
|
|
|
cat <<-\END_PART1 &&
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data <<data_end
|
|
|
|
END_PART1
|
|
|
|
cat big &&
|
|
|
|
cat <<-\EOF
|
|
|
|
data_end
|
|
|
|
blob
|
|
|
|
mark :2
|
|
|
|
data <<data_end
|
|
|
|
hello
|
|
|
|
data_end
|
|
|
|
cat-blob :1
|
|
|
|
cat-blob :2
|
|
|
|
EOF
|
|
|
|
} |
|
|
|
|
git fast-import >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success PIPE 'R: copy using cat-file' '
|
|
|
|
expect_id=$(git hash-object big) &&
|
|
|
|
expect_len=$(wc -c <big) &&
|
|
|
|
echo $expect_id blob $expect_len >expect.response &&
|
|
|
|
|
|
|
|
rm -f blobs &&
|
|
|
|
|
|
|
|
mkfifo blobs &&
|
|
|
|
(
|
|
|
|
export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE &&
|
2010-12-13 17:28:05 +08:00
|
|
|
cat <<-\EOF &&
|
|
|
|
feature cat-blob
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data <<BLOB
|
|
|
|
EOF
|
|
|
|
cat big &&
|
|
|
|
cat <<-\EOF &&
|
|
|
|
BLOB
|
|
|
|
cat-blob :1
|
|
|
|
EOF
|
|
|
|
|
|
|
|
read blob_id type size <&3 &&
|
|
|
|
echo "$blob_id $type $size" >response &&
|
t9300: factor out portable "head -c" replacement
It is sometimes useful to be able to read exactly N bytes from a
pipe. Doing this portably turns out to be surprisingly difficult
in shell scripts.
We want a solution that:
- is portable
- never reads more than N bytes due to buffering (which
would mean those bytes are not available to the next
program to read from the same pipe)
- handles partial reads by looping until N bytes are read
(or we see EOF)
- is resilient to stray signals giving us EINTR while
trying to read (even though we don't send them, things
like SIGWINCH could cause apparently-random failures)
Some possible solutions are:
- "head -c" is not portable, and implementations may
buffer (though GNU head does not)
- "read -N" is a bash-ism, and thus not portable
- "dd bs=$n count=1" does not handle partial reads. GNU dd
has iflags=fullblock, but that is not portable
- "dd bs=1 count=$n" fixes the partial read problem (all
reads are 1-byte, so there can be no partial response).
It does make a lot of write() calls, but for our tests
that's unlikely to matter. It's fairly portable. We
already use it in our tests, and it's unlikely that
implementations would screw up any of our criteria. The
most unknown one would be signal handling.
- perl can do a sysread() loop pretty easily. On my Linux
system, at least, it seems to restart the read() call
automatically. If that turns out not to be portable,
though, it would be easy for us to handle it.
That makes the perl solution the least bad (because we
conveniently omitted "length of code" as a criterion).
It's also what t9300 is currently using, so we can just pull
the implementation from there.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-30 17:07:54 +08:00
|
|
|
test_copy_bytes $size >blob <&3 &&
|
2010-12-13 17:28:05 +08:00
|
|
|
read newline <&3 &&
|
|
|
|
|
|
|
|
cat <<-EOF &&
|
|
|
|
commit refs/heads/copied
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
copy big file as file3
|
|
|
|
COMMIT
|
|
|
|
M 644 inline file3
|
|
|
|
data <<BLOB
|
|
|
|
EOF
|
|
|
|
cat blob &&
|
|
|
|
echo BLOB
|
|
|
|
) 3<blobs |
|
|
|
|
git fast-import --cat-blob-fd=3 3>blobs &&
|
2010-11-29 03:45:01 +08:00
|
|
|
git show copied:file3 >actual &&
|
|
|
|
test_cmp expect.response response &&
|
|
|
|
test_cmp big actual
|
|
|
|
'
|
|
|
|
|
2010-11-29 03:45:58 +08:00
|
|
|
test_expect_success PIPE 'R: print blob mid-commit' '
|
|
|
|
rm -f blobs &&
|
|
|
|
echo "A blob from _before_ the commit." >expect &&
|
|
|
|
mkfifo blobs &&
|
|
|
|
(
|
|
|
|
exec 3<blobs &&
|
|
|
|
cat <<-EOF &&
|
|
|
|
feature cat-blob
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data <<BLOB
|
|
|
|
A blob from _before_ the commit.
|
|
|
|
BLOB
|
|
|
|
commit refs/heads/temporary
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
Empty commit
|
|
|
|
COMMIT
|
|
|
|
cat-blob :1
|
|
|
|
EOF
|
|
|
|
|
|
|
|
read blob_id type size <&3 &&
|
t9300: factor out portable "head -c" replacement
It is sometimes useful to be able to read exactly N bytes from a
pipe. Doing this portably turns out to be surprisingly difficult
in shell scripts.
We want a solution that:
- is portable
- never reads more than N bytes due to buffering (which
would mean those bytes are not available to the next
program to read from the same pipe)
- handles partial reads by looping until N bytes are read
(or we see EOF)
- is resilient to stray signals giving us EINTR while
trying to read (even though we don't send them, things
like SIGWINCH could cause apparently-random failures)
Some possible solutions are:
- "head -c" is not portable, and implementations may
buffer (though GNU head does not)
- "read -N" is a bash-ism, and thus not portable
- "dd bs=$n count=1" does not handle partial reads. GNU dd
has iflags=fullblock, but that is not portable
- "dd bs=1 count=$n" fixes the partial read problem (all
reads are 1-byte, so there can be no partial response).
It does make a lot of write() calls, but for our tests
that's unlikely to matter. It's fairly portable. We
already use it in our tests, and it's unlikely that
implementations would screw up any of our criteria. The
most unknown one would be signal handling.
- perl can do a sysread() loop pretty easily. On my Linux
system, at least, it seems to restart the read() call
automatically. If that turns out not to be portable,
though, it would be easy for us to handle it.
That makes the perl solution the least bad (because we
conveniently omitted "length of code" as a criterion).
It's also what t9300 is currently using, so we can just pull
the implementation from there.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-30 17:07:54 +08:00
|
|
|
test_copy_bytes $size >actual <&3 &&
|
2010-11-29 03:45:58 +08:00
|
|
|
read newline <&3 &&
|
|
|
|
|
|
|
|
echo
|
|
|
|
) |
|
|
|
|
git fast-import --cat-blob-fd=3 3>blobs &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success PIPE 'R: print staged blob within commit' '
|
|
|
|
rm -f blobs &&
|
|
|
|
echo "A blob from _within_ the commit." >expect &&
|
|
|
|
mkfifo blobs &&
|
|
|
|
(
|
|
|
|
exec 3<blobs &&
|
|
|
|
cat <<-EOF &&
|
|
|
|
feature cat-blob
|
|
|
|
commit refs/heads/within
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
Empty commit
|
|
|
|
COMMIT
|
|
|
|
M 644 inline within
|
|
|
|
data <<BLOB
|
|
|
|
A blob from _within_ the commit.
|
|
|
|
BLOB
|
|
|
|
EOF
|
|
|
|
|
|
|
|
to_get=$(
|
|
|
|
echo "A blob from _within_ the commit." |
|
|
|
|
git hash-object --stdin
|
|
|
|
) &&
|
|
|
|
echo "cat-blob $to_get" &&
|
|
|
|
|
|
|
|
read blob_id type size <&3 &&
|
t9300: factor out portable "head -c" replacement
It is sometimes useful to be able to read exactly N bytes from a
pipe. Doing this portably turns out to be surprisingly difficult
in shell scripts.
We want a solution that:
- is portable
- never reads more than N bytes due to buffering (which
would mean those bytes are not available to the next
program to read from the same pipe)
- handles partial reads by looping until N bytes are read
(or we see EOF)
- is resilient to stray signals giving us EINTR while
trying to read (even though we don't send them, things
like SIGWINCH could cause apparently-random failures)
Some possible solutions are:
- "head -c" is not portable, and implementations may
buffer (though GNU head does not)
- "read -N" is a bash-ism, and thus not portable
- "dd bs=$n count=1" does not handle partial reads. GNU dd
has iflags=fullblock, but that is not portable
- "dd bs=1 count=$n" fixes the partial read problem (all
reads are 1-byte, so there can be no partial response).
It does make a lot of write() calls, but for our tests
that's unlikely to matter. It's fairly portable. We
already use it in our tests, and it's unlikely that
implementations would screw up any of our criteria. The
most unknown one would be signal handling.
- perl can do a sysread() loop pretty easily. On my Linux
system, at least, it seems to restart the read() call
automatically. If that turns out not to be portable,
though, it would be easy for us to handle it.
That makes the perl solution the least bad (because we
conveniently omitted "length of code" as a criterion).
It's also what t9300 is currently using, so we can just pull
the implementation from there.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-30 17:07:54 +08:00
|
|
|
test_copy_bytes $size >actual <&3 &&
|
2010-11-29 03:45:58 +08:00
|
|
|
read newline <&3 &&
|
|
|
|
|
|
|
|
echo deleteall
|
|
|
|
) |
|
|
|
|
git fast-import --cat-blob-fd=3 3>blobs &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'R: quiet option results in no stats being output' '
|
|
|
|
cat >input <<-EOF &&
|
|
|
|
option git quiet
|
|
|
|
blob
|
|
|
|
data 3
|
|
|
|
hi
|
2009-12-05 01:06:58 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2009-12-05 01:06:58 +08:00
|
|
|
|
2019-08-29 23:19:18 +08:00
|
|
|
git fast-import 2>output <input &&
|
2015-11-20 03:09:45 +08:00
|
|
|
test_must_be_empty output
|
2009-12-05 01:06:58 +08:00
|
|
|
'
|
|
|
|
|
2011-07-16 21:03:32 +08:00
|
|
|
test_expect_success 'R: feature done means terminating "done" is mandatory' '
|
|
|
|
echo feature done | test_must_fail git fast-import &&
|
|
|
|
test_must_fail git fast-import --done </dev/null
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: terminating "done" with trailing gibberish is ok' '
|
|
|
|
git fast-import <<-\EOF &&
|
|
|
|
feature done
|
|
|
|
done
|
|
|
|
trailing gibberish
|
|
|
|
EOF
|
|
|
|
git fast-import <<-\EOF
|
|
|
|
done
|
|
|
|
more trailing gibberish
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: terminating "done" within commit' '
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
OBJID
|
|
|
|
:000000 100644 OBJID OBJID A hello.c
|
|
|
|
:000000 100644 OBJID OBJID A hello2.c
|
|
|
|
EOF
|
|
|
|
git fast-import <<-EOF &&
|
|
|
|
commit refs/heads/done-ends
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<EOT
|
|
|
|
Commit terminated by "done" command
|
|
|
|
EOT
|
|
|
|
M 100644 inline hello.c
|
|
|
|
data <<EOT
|
|
|
|
Hello, world.
|
|
|
|
EOT
|
|
|
|
C hello.c hello2.c
|
|
|
|
done
|
|
|
|
EOF
|
|
|
|
git rev-list done-ends |
|
|
|
|
git diff-tree -r --stdin --root --always |
|
2018-05-13 10:24:15 +08:00
|
|
|
sed -e "s/$OID_REGEX/OBJID/g" >actual &&
|
2011-07-16 21:03:32 +08:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2009-12-05 01:06:58 +08:00
|
|
|
test_expect_success 'R: die on unknown option' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
option git non-existing-option
|
|
|
|
EOF
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_must_fail git fast-import <input
|
2009-12-05 01:06:58 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: unknown commandline options are rejected' '\
|
2015-11-20 03:09:43 +08:00
|
|
|
test_must_fail git fast-import --non-existing-option < /dev/null
|
2009-12-05 01:06:58 +08:00
|
|
|
'
|
|
|
|
|
2010-11-29 03:42:46 +08:00
|
|
|
test_expect_success 'R: die on invalid option argument' '
|
|
|
|
echo "option git active-branches=-5" |
|
|
|
|
test_must_fail git fast-import &&
|
|
|
|
echo "option git depth=" |
|
|
|
|
test_must_fail git fast-import &&
|
|
|
|
test_must_fail git fast-import --depth="5 elephants" </dev/null
|
|
|
|
'
|
|
|
|
|
2009-12-05 01:06:58 +08:00
|
|
|
test_expect_success 'R: ignore non-git options' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-EOF &&
|
|
|
|
option non-existing-vcs non-existing-option
|
|
|
|
EOF
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input
|
2009-12-05 01:06:58 +08:00
|
|
|
'
|
|
|
|
|
2016-05-18 05:40:23 +08:00
|
|
|
test_expect_success 'R: corrupt lines do not mess marks file' '
|
|
|
|
rm -f io.marks &&
|
|
|
|
blob=$(echo hi | git hash-object --stdin) &&
|
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:11 +08:00
|
|
|
:3 $ZERO_OID
|
2016-05-18 05:40:23 +08:00
|
|
|
:1 $blob
|
|
|
|
:2 $blob
|
|
|
|
EOF
|
|
|
|
cp expect io.marks &&
|
|
|
|
test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
|
|
|
|
|
|
|
|
EOF
|
|
|
|
test_cmp expect io.marks
|
|
|
|
'
|
|
|
|
|
2010-02-02 01:27:35 +08:00
|
|
|
##
|
|
|
|
## R: very large blobs
|
|
|
|
##
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'R: blob bigger than threshold' '
|
2015-11-20 03:09:49 +08:00
|
|
|
blobsize=$((2*1024*1024 + 53)) &&
|
2018-03-24 15:44:42 +08:00
|
|
|
test-tool genrandom bar $blobsize >expect &&
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/big-file
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
R - big file
|
|
|
|
COMMIT
|
|
|
|
|
|
|
|
M 644 inline big1
|
|
|
|
data $blobsize
|
|
|
|
INPUT_END
|
|
|
|
cat expect >>input &&
|
|
|
|
cat >>input <<-INPUT_END &&
|
|
|
|
M 644 inline big2
|
|
|
|
data $blobsize
|
|
|
|
INPUT_END
|
|
|
|
cat expect >>input &&
|
|
|
|
echo >>input &&
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_create_repo R &&
|
2016-04-26 05:17:28 +08:00
|
|
|
git --git-dir=R/.git config fastimport.unpackLimit 0 &&
|
2015-11-20 03:09:43 +08:00
|
|
|
git --git-dir=R/.git fast-import --big-file-threshold=1 <input
|
|
|
|
'
|
2012-04-20 14:25:09 +08:00
|
|
|
|
|
|
|
test_expect_success 'R: verify created pack' '
|
|
|
|
(
|
|
|
|
cd R &&
|
|
|
|
verify_packs -v > ../verify
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
test_expect_success 'R: verify written objects' '
|
|
|
|
git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
|
|
|
|
test_cmp_bin expect actual &&
|
|
|
|
a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
|
|
|
|
b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
|
|
|
|
test $a = $b
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'R: blob appears only once' '
|
|
|
|
n=$(grep $a verify | wc -l) &&
|
|
|
|
test 1 = $n
|
|
|
|
'
|
2010-02-02 01:27:35 +08:00
|
|
|
|
2012-04-08 06:59:20 +08:00
|
|
|
###
|
|
|
|
### series S
|
|
|
|
###
|
|
|
|
#
|
|
|
|
# Make sure missing spaces and EOLs after mark references
|
|
|
|
# cause errors.
|
|
|
|
#
|
|
|
|
# Setup:
|
|
|
|
#
|
|
|
|
# 1--2--4
|
|
|
|
# \ /
|
|
|
|
# -3-
|
|
|
|
#
|
|
|
|
# commit marks: 301, 302, 303, 304
|
|
|
|
# blob marks: 403, 404, resp.
|
|
|
|
# note mark: 202
|
|
|
|
#
|
|
|
|
# The error message when a space is missing not at the
|
|
|
|
# end of the line is:
|
|
|
|
#
|
|
|
|
# Missing space after ..
|
|
|
|
#
|
|
|
|
# or when extra characters come after the mark at the end
|
|
|
|
# of the line:
|
|
|
|
#
|
|
|
|
# Garbage after ..
|
|
|
|
#
|
|
|
|
# or when the dataref is neither "inline " or a known SHA1,
|
|
|
|
#
|
|
|
|
# Invalid dataref ..
|
|
|
|
#
|
|
|
|
test_expect_success 'S: initialize for S tests' '
|
2015-11-20 03:09:49 +08:00
|
|
|
test_tick &&
|
|
|
|
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/S
|
|
|
|
mark :301
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit 1
|
|
|
|
COMMIT
|
|
|
|
M 100644 inline hello.c
|
|
|
|
data <<BLOB
|
|
|
|
blob 1
|
|
|
|
BLOB
|
|
|
|
|
|
|
|
commit refs/heads/S
|
|
|
|
mark :302
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit 2
|
|
|
|
COMMIT
|
|
|
|
from :301
|
|
|
|
M 100644 inline hello.c
|
|
|
|
data <<BLOB
|
|
|
|
blob 2
|
|
|
|
BLOB
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :403
|
|
|
|
data <<BLOB
|
|
|
|
blob 3
|
|
|
|
BLOB
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :202
|
|
|
|
data <<BLOB
|
|
|
|
note 2
|
|
|
|
BLOB
|
|
|
|
INPUT_END
|
|
|
|
|
2012-04-08 06:59:20 +08:00
|
|
|
git fast-import --export-marks=marks <input
|
|
|
|
'
|
|
|
|
|
|
|
|
#
|
|
|
|
# filemodify, three datarefs
|
|
|
|
#
|
|
|
|
test_expect_success 'S: filemodify with garbage after mark must fail' '
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
commit refs/heads/S
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit N
|
|
|
|
COMMIT
|
|
|
|
M 100644 :403x hello.c
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "space after mark" err
|
|
|
|
'
|
|
|
|
|
|
|
|
# inline is misspelled; fast-import thinks it is some unknown dataref
|
|
|
|
test_expect_success 'S: filemodify with garbage after inline must fail' '
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
commit refs/heads/S
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit N
|
|
|
|
COMMIT
|
|
|
|
M 100644 inlineX hello.c
|
|
|
|
data <<BLOB
|
|
|
|
inline
|
|
|
|
BLOB
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "nvalid dataref" err
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'S: filemodify with garbage after sha1 must fail' '
|
|
|
|
sha1=$(grep :403 marks | cut -d\ -f2) &&
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
commit refs/heads/S
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit N
|
|
|
|
COMMIT
|
|
|
|
M 100644 ${sha1}x hello.c
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "space after SHA1" err
|
|
|
|
'
|
|
|
|
|
|
|
|
#
|
|
|
|
# notemodify, three ways to say dataref
|
|
|
|
#
|
2017-06-25 18:20:41 +08:00
|
|
|
test_expect_success 'S: notemodify with garbage after mark dataref must fail' '
|
2012-04-08 06:59:20 +08:00
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
commit refs/heads/S
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit S note dataref markref
|
|
|
|
COMMIT
|
|
|
|
N :202x :302
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "space after mark" err
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'S: notemodify with garbage after inline dataref must fail' '
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
commit refs/heads/S
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit S note dataref inline
|
|
|
|
COMMIT
|
|
|
|
N inlineX :302
|
|
|
|
data <<BLOB
|
|
|
|
note blob
|
|
|
|
BLOB
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "nvalid dataref" err
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '
|
|
|
|
sha1=$(grep :202 marks | cut -d\ -f2) &&
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
commit refs/heads/S
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit S note dataref sha1
|
|
|
|
COMMIT
|
|
|
|
N ${sha1}x :302
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "space after SHA1" err
|
|
|
|
'
|
|
|
|
|
|
|
|
#
|
2013-09-05 03:04:31 +08:00
|
|
|
# notemodify, mark in commit-ish
|
2012-04-08 06:59:20 +08:00
|
|
|
#
|
2014-09-21 23:02:57 +08:00
|
|
|
test_expect_success 'S: notemodify with garbage after mark commit-ish must fail' '
|
2012-04-08 06:59:20 +08:00
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
commit refs/heads/Snotes
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
2013-09-05 03:04:31 +08:00
|
|
|
commit S note commit-ish
|
2012-04-08 06:59:20 +08:00
|
|
|
COMMIT
|
|
|
|
N :202 :302x
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "after mark" err
|
|
|
|
'
|
|
|
|
|
|
|
|
#
|
|
|
|
# from
|
|
|
|
#
|
|
|
|
test_expect_success 'S: from with garbage after mark must fail' '
|
2015-03-20 18:09:22 +08:00
|
|
|
test_must_fail \
|
|
|
|
git fast-import --import-marks=marks --export-marks=marks <<-EOF 2>err &&
|
2012-04-08 06:59:20 +08:00
|
|
|
commit refs/heads/S2
|
|
|
|
mark :303
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit 3
|
|
|
|
COMMIT
|
|
|
|
from :301x
|
|
|
|
M 100644 :403 hello.c
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
|
|
# go create the commit, need it for merge test
|
|
|
|
git fast-import --import-marks=marks --export-marks=marks <<-EOF &&
|
|
|
|
commit refs/heads/S2
|
|
|
|
mark :303
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
commit 3
|
|
|
|
COMMIT
|
|
|
|
from :301
|
|
|
|
M 100644 :403 hello.c
|
|
|
|
EOF
|
|
|
|
|
|
|
|
# now evaluate the error
|
|
|
|
test_i18ngrep "after mark" err
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# merge
|
|
|
|
#
|
|
|
|
test_expect_success 'S: merge with garbage after mark must fail' '
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
commit refs/heads/S
|
|
|
|
mark :304
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
merge 4
|
|
|
|
COMMIT
|
|
|
|
from :302
|
|
|
|
merge :303x
|
|
|
|
M 100644 :403 hello.c
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "after mark" err
|
|
|
|
'
|
|
|
|
|
|
|
|
#
|
|
|
|
# tag, from markref
|
|
|
|
#
|
|
|
|
test_expect_success 'S: tag with garbage after mark must fail' '
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
tag refs/tags/Stag
|
|
|
|
from :302x
|
|
|
|
tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<TAG
|
|
|
|
tag S
|
|
|
|
TAG
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "after mark" err
|
|
|
|
'
|
|
|
|
|
|
|
|
#
|
|
|
|
# cat-blob markref
|
|
|
|
#
|
|
|
|
test_expect_success 'S: cat-blob with garbage after mark must fail' '
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
cat-blob :403x
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "after mark" err
|
|
|
|
'
|
|
|
|
|
|
|
|
#
|
|
|
|
# ls markref
|
|
|
|
#
|
|
|
|
test_expect_success 'S: ls with garbage after mark must fail' '
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
ls :302x hello.c
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "space after mark" err
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'S: ls with garbage after sha1 must fail' '
|
|
|
|
sha1=$(grep :302 marks | cut -d\ -f2) &&
|
|
|
|
test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
|
|
|
|
ls ${sha1}x hello.c
|
|
|
|
EOF
|
|
|
|
test_i18ngrep "space after tree-ish" err
|
|
|
|
'
|
|
|
|
|
2013-06-23 22:58:19 +08:00
|
|
|
###
|
|
|
|
### series T (ls)
|
|
|
|
###
|
|
|
|
# Setup is carried over from series S.
|
|
|
|
|
2013-06-23 22:58:21 +08:00
|
|
|
test_expect_success 'T: ls root tree' '
|
2013-06-23 22:58:19 +08:00
|
|
|
sed -e "s/Z\$//" >expect <<-EOF &&
|
|
|
|
040000 tree $(git rev-parse S^{tree}) Z
|
|
|
|
EOF
|
|
|
|
sha1=$(git rev-parse --verify S) &&
|
|
|
|
git fast-import --import-marks=marks <<-EOF >actual &&
|
|
|
|
ls $sha1 ""
|
|
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2014-04-21 02:59:27 +08:00
|
|
|
test_expect_success 'T: delete branch' '
|
|
|
|
git branch to-delete &&
|
|
|
|
git fast-import <<-EOF &&
|
|
|
|
reset refs/heads/to-delete
|
2020-07-30 07:14:11 +08:00
|
|
|
from $ZERO_OID
|
2014-04-21 02:59:27 +08:00
|
|
|
EOF
|
|
|
|
test_must_fail git rev-parse --verify refs/heads/to-delete
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'T: empty reset doesnt delete branch' '
|
|
|
|
git branch not-to-delete &&
|
|
|
|
git fast-import <<-EOF &&
|
|
|
|
reset refs/heads/not-to-delete
|
|
|
|
EOF
|
|
|
|
git show-ref &&
|
|
|
|
git rev-parse --verify refs/heads/not-to-delete
|
|
|
|
'
|
|
|
|
|
2014-08-29 19:53:36 +08:00
|
|
|
###
|
|
|
|
### series U (filedelete)
|
|
|
|
###
|
|
|
|
|
|
|
|
test_expect_success 'U: initialize for U tests' '
|
2015-11-20 03:09:49 +08:00
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/U
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
test setup
|
|
|
|
COMMIT
|
|
|
|
M 100644 inline hello.c
|
|
|
|
data <<BLOB
|
|
|
|
blob 1
|
|
|
|
BLOB
|
|
|
|
M 100644 inline good/night.txt
|
|
|
|
data <<BLOB
|
|
|
|
sleep well
|
|
|
|
BLOB
|
|
|
|
M 100644 inline good/bye.txt
|
|
|
|
data <<BLOB
|
|
|
|
au revoir
|
|
|
|
BLOB
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
2020-07-30 07:14:10 +08:00
|
|
|
f7id=$(echo "blob 1" | git hash-object --stdin) &&
|
|
|
|
f8id=$(echo "sleep well" | git hash-object --stdin) &&
|
|
|
|
f9id=$(echo "au revoir" | git hash-object --stdin) &&
|
2014-08-29 19:53:36 +08:00
|
|
|
git fast-import <input
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'U: filedelete file succeeds' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/U
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
delete good/night.txt
|
|
|
|
COMMIT
|
|
|
|
from refs/heads/U^0
|
|
|
|
D good/night.txt
|
2014-08-29 19:53:36 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2014-08-29 19:53:36 +08:00
|
|
|
|
|
|
|
git fast-import <input
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'U: validate file delete result' '
|
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100644 000000 $f8id $ZERO_OID D good/night.txt
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2014-08-29 19:53:36 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
git diff-tree -M -r U^1 U >actual &&
|
2014-08-29 19:53:36 +08:00
|
|
|
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'U: filedelete directory succeeds' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/U
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
delete good dir
|
|
|
|
COMMIT
|
|
|
|
from refs/heads/U^0
|
|
|
|
D good
|
2014-08-29 19:53:36 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2014-08-29 19:53:36 +08:00
|
|
|
|
|
|
|
git fast-import <input
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'U: validate directory delete result' '
|
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100644 000000 $f9id $ZERO_OID D good/bye.txt
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2014-08-29 19:53:36 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
git diff-tree -M -r U^1 U >actual &&
|
2014-08-29 19:53:36 +08:00
|
|
|
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'U: filedelete root succeeds' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/U
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data <<COMMIT
|
|
|
|
must succeed
|
|
|
|
COMMIT
|
|
|
|
from refs/heads/U^0
|
|
|
|
D ""
|
2014-08-29 19:53:36 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
INPUT_END
|
2014-08-29 19:53:36 +08:00
|
|
|
|
2015-11-20 03:09:43 +08:00
|
|
|
git fast-import <input
|
2014-08-29 19:53:36 +08:00
|
|
|
'
|
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
test_expect_success 'U: validate root delete result' '
|
|
|
|
cat >expect <<-EOF &&
|
2020-07-30 07:14:10 +08:00
|
|
|
:100644 000000 $f7id $ZERO_OID D hello.c
|
2015-11-20 03:09:49 +08:00
|
|
|
EOF
|
2014-08-29 19:53:36 +08:00
|
|
|
|
2015-11-20 03:09:49 +08:00
|
|
|
git diff-tree -M -r U^1 U >actual &&
|
2014-08-29 19:53:36 +08:00
|
|
|
|
|
|
|
compare_diff_raw expect actual
|
|
|
|
'
|
|
|
|
|
2017-09-29 11:09:36 +08:00
|
|
|
###
|
|
|
|
### series V (checkpoint)
|
|
|
|
###
|
|
|
|
|
|
|
|
# The commands in input_file should not produce any output on the file
|
|
|
|
# descriptor set with --cat-blob-fd (or stdout if unspecified).
|
|
|
|
#
|
|
|
|
# To make sure you're observing the side effects of checkpoint *before*
|
|
|
|
# fast-import terminates (and thus writes out its state), check that the
|
|
|
|
# fast-import process is still running using background_import_still_running
|
|
|
|
# *after* evaluating the test conditions.
|
|
|
|
background_import_then_checkpoint () {
|
|
|
|
options=$1
|
|
|
|
input_file=$2
|
|
|
|
|
|
|
|
mkfifo V.input
|
|
|
|
exec 8<>V.input
|
|
|
|
rm V.input
|
|
|
|
|
|
|
|
mkfifo V.output
|
|
|
|
exec 9<>V.output
|
|
|
|
rm V.output
|
|
|
|
|
t9300-fast-import: don't hang if background fast-import exits too early
The five tests checking 'git fast-import's checkpoint handling in
't9300-fast-import.sh', all with the prefix "V:" in their test
description, can hang indefinitely if 'git fast-import' unexpectedly
dies early in any of these tests.
These five tests run 'git fast-import' in the background, while
feeding instructions to its standard input through a fifo (fd 8) from
a background subshell, and reading and verifying its standard output
through another fifo (fd 9) in the test script's main shell process.
This "reading and verifying" is basically a 'while read ...' shell
loop iterating until 'git fast-import' outputs the expected line,
ignoring any other output. This doesn't work very well when 'git
fast-import' dies before printing that particular line, because the
'read' builtin doesn't get EOF after the death of 'git fast-import',
as their input and output are not connected directly but through a
fifo. Consequently, that 'read' hangs waiting for the next line from
the already dead 'git fast-import', leaving the test script and in
turn the whole test suite hanging.
Avoid this hang by checking whether the background 'git fast-import'
process exited unexpectedly early, and interrupt the 'while read' loop
if it did. We have to jump through some hoops to achive that, though:
- Start the background 'git fast-import' in another background
subshell, which then:
- prints the PID of that 'git fast-import' process to the fifo,
to be read by the main shell process, so it will know which
process to kill when the test is finished.
- waits until that 'git fast-import' process exits. If it does
exit, then report its exit code, and write a message to the
fifo used for 'git fast-import's standard output, thus
un-block the 'read' builtin in the main shell process.
- Modify that 'while read' loop to break the loop upon seeing that
message, and fail the test in the usual way.
- Once the test is finished kill that background subshell as well,
and do so before killing the background 'git fast-import'.
Otherwise the background 'git fast-import' and subshell processes
would die racily, and if 'git fast-import' were to die sooner,
then we might get some undesired and potentially confusing
messages in the test's output.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-12-07 03:03:31 +08:00
|
|
|
(
|
|
|
|
git fast-import $options <&8 >&9 &
|
|
|
|
echo $! >&9
|
|
|
|
wait $!
|
|
|
|
echo >&2 "background fast-import terminated too early with exit code $?"
|
|
|
|
# Un-block the read loop in the main shell process.
|
|
|
|
echo >&9 UNEXPECTED
|
|
|
|
) &
|
|
|
|
sh_pid=$!
|
|
|
|
read fi_pid <&9
|
2017-09-29 11:09:36 +08:00
|
|
|
# We don't mind if fast-import has already died by the time the test
|
|
|
|
# ends.
|
t9300: wait for background fast-import process to die after killing it
The five new tests added to 't9300-fast-import.sh' in 30e215a65c
(fast-import: checkpoint: dump branches/tags/marks even if
object_count==0, 2017-09-28), all with the prefix "V:" in their test
description, run 'git fast-import' in the background and then 'kill'
it as part of a 'test_when_finished' cleanup command. When this test
script is executed with Bash, some or even all of these tests tend to
pollute the test script's stderr, and messages about terminated
processes end up on the terminal:
$ bash ./t9300-fast-import.sh
<... snip ...>
ok 179 - V: checkpoint helper does not get stuck with extra output
/<...>/test-lib-functions.sh: line 388: 28383 Terminated git fast-import $options 0<&8 1>&9
ok 180 - V: checkpoint updates refs after reset
./t9300-fast-import.sh: line 3210: 28401 Terminated git fast-import $options 0<&8 1>&9
ok 181 - V: checkpoint updates refs and marks after commit
ok 182 - V: checkpoint updates refs and marks after commit (no new objects)
./test-lib.sh: line 634: line 3250: 28485 Terminated git fast-import $options 0<&8 1>&9
ok 183 - V: checkpoint updates tags after tag
./t9300-fast-import.sh: line 3264: 28510 Terminated git fast-import $options 0<&8 1>&9
After a background child process terminates, its parent Bash process
always outputs a message like those above to stderr, even when in
non-interactive mode.
But how do some of these messages end up on the test script's stderr,
why don't we get them from all five tests, and why do they come from
different file/line locations? Well, after sending the TERM signal to
the background child process, it takes a little while until that
process receives the signal and terminates, and then it takes another
while until the parent process notices it. During this time the
parent Bash process is continuing execution, and by the time it
notices that its child terminated it might have already left
'test_eval_inner_' and its stderr is not redirected to /dev/null
anymore. That's why such a message can appear on the test script's
stderr, while other times, when the child terminates fast and/or the
parent shell is slow enough, the message ends up in /dev/null, just
like any other output of the test does. Bash always adds the file
name and line number of the code location it was about to execute when
it notices the termination of its child process as a prefix to that
message, hence the varying and sometimes totally unrelated location
prefixes in those messages (e.g. line 388 in 'test-lib-functions.sh'
is 'test_verify_prereq', and I saw such a message pointing to
'say_color' as well).
Prevent these messages from appearing on the test script's stderr by
'wait'-ing on the pid of the background 'git fast-import' process
after sending it the TERM signal. This ensures that the executing
shell's stderr is still redirected when the shell notices the
termination of its child process in the background, and that these
messages get a consistent file/line location prefix.
Note that this is not an issue when the test script is run with Bash
and '-v', because then these messages are supposed to go to the test
script's stderr anyway, and indeed all of them do; though the
sometimes seemingly random file/line prefixes could be confusing
still. Similarly, it's not an issue with Bash and '--verbose-log'
either, because then all messages go to the log file as they should.
Finally, it's not an issue with some other shells (I tried dash, ksh,
ksh93 and mksh) even without any of the verbose options, because they
don't print messages like these in non-interactive mode in the first
place.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-07-20 06:26:41 +08:00
|
|
|
test_when_finished "
|
|
|
|
exec 8>&-; exec 9>&-;
|
t9300-fast-import: don't hang if background fast-import exits too early
The five tests checking 'git fast-import's checkpoint handling in
't9300-fast-import.sh', all with the prefix "V:" in their test
description, can hang indefinitely if 'git fast-import' unexpectedly
dies early in any of these tests.
These five tests run 'git fast-import' in the background, while
feeding instructions to its standard input through a fifo (fd 8) from
a background subshell, and reading and verifying its standard output
through another fifo (fd 9) in the test script's main shell process.
This "reading and verifying" is basically a 'while read ...' shell
loop iterating until 'git fast-import' outputs the expected line,
ignoring any other output. This doesn't work very well when 'git
fast-import' dies before printing that particular line, because the
'read' builtin doesn't get EOF after the death of 'git fast-import',
as their input and output are not connected directly but through a
fifo. Consequently, that 'read' hangs waiting for the next line from
the already dead 'git fast-import', leaving the test script and in
turn the whole test suite hanging.
Avoid this hang by checking whether the background 'git fast-import'
process exited unexpectedly early, and interrupt the 'while read' loop
if it did. We have to jump through some hoops to achive that, though:
- Start the background 'git fast-import' in another background
subshell, which then:
- prints the PID of that 'git fast-import' process to the fifo,
to be read by the main shell process, so it will know which
process to kill when the test is finished.
- waits until that 'git fast-import' process exits. If it does
exit, then report its exit code, and write a message to the
fifo used for 'git fast-import's standard output, thus
un-block the 'read' builtin in the main shell process.
- Modify that 'while read' loop to break the loop upon seeing that
message, and fail the test in the usual way.
- Once the test is finished kill that background subshell as well,
and do so before killing the background 'git fast-import'.
Otherwise the background 'git fast-import' and subshell processes
would die racily, and if 'git fast-import' were to die sooner,
then we might get some undesired and potentially confusing
messages in the test's output.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-12-07 03:03:31 +08:00
|
|
|
kill $sh_pid && wait $sh_pid
|
2019-12-07 03:03:30 +08:00
|
|
|
kill $fi_pid && wait $fi_pid
|
t9300: wait for background fast-import process to die after killing it
The five new tests added to 't9300-fast-import.sh' in 30e215a65c
(fast-import: checkpoint: dump branches/tags/marks even if
object_count==0, 2017-09-28), all with the prefix "V:" in their test
description, run 'git fast-import' in the background and then 'kill'
it as part of a 'test_when_finished' cleanup command. When this test
script is executed with Bash, some or even all of these tests tend to
pollute the test script's stderr, and messages about terminated
processes end up on the terminal:
$ bash ./t9300-fast-import.sh
<... snip ...>
ok 179 - V: checkpoint helper does not get stuck with extra output
/<...>/test-lib-functions.sh: line 388: 28383 Terminated git fast-import $options 0<&8 1>&9
ok 180 - V: checkpoint updates refs after reset
./t9300-fast-import.sh: line 3210: 28401 Terminated git fast-import $options 0<&8 1>&9
ok 181 - V: checkpoint updates refs and marks after commit
ok 182 - V: checkpoint updates refs and marks after commit (no new objects)
./test-lib.sh: line 634: line 3250: 28485 Terminated git fast-import $options 0<&8 1>&9
ok 183 - V: checkpoint updates tags after tag
./t9300-fast-import.sh: line 3264: 28510 Terminated git fast-import $options 0<&8 1>&9
After a background child process terminates, its parent Bash process
always outputs a message like those above to stderr, even when in
non-interactive mode.
But how do some of these messages end up on the test script's stderr,
why don't we get them from all five tests, and why do they come from
different file/line locations? Well, after sending the TERM signal to
the background child process, it takes a little while until that
process receives the signal and terminates, and then it takes another
while until the parent process notices it. During this time the
parent Bash process is continuing execution, and by the time it
notices that its child terminated it might have already left
'test_eval_inner_' and its stderr is not redirected to /dev/null
anymore. That's why such a message can appear on the test script's
stderr, while other times, when the child terminates fast and/or the
parent shell is slow enough, the message ends up in /dev/null, just
like any other output of the test does. Bash always adds the file
name and line number of the code location it was about to execute when
it notices the termination of its child process as a prefix to that
message, hence the varying and sometimes totally unrelated location
prefixes in those messages (e.g. line 388 in 'test-lib-functions.sh'
is 'test_verify_prereq', and I saw such a message pointing to
'say_color' as well).
Prevent these messages from appearing on the test script's stderr by
'wait'-ing on the pid of the background 'git fast-import' process
after sending it the TERM signal. This ensures that the executing
shell's stderr is still redirected when the shell notices the
termination of its child process in the background, and that these
messages get a consistent file/line location prefix.
Note that this is not an issue when the test script is run with Bash
and '-v', because then these messages are supposed to go to the test
script's stderr anyway, and indeed all of them do; though the
sometimes seemingly random file/line prefixes could be confusing
still. Similarly, it's not an issue with Bash and '--verbose-log'
either, because then all messages go to the log file as they should.
Finally, it's not an issue with some other shells (I tried dash, ksh,
ksh93 and mksh) even without any of the verbose options, because they
don't print messages like these in non-interactive mode in the first
place.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-07-20 06:26:41 +08:00
|
|
|
true"
|
2017-09-29 11:09:36 +08:00
|
|
|
|
|
|
|
# Start in the background to ensure we adhere strictly to (blocking)
|
|
|
|
# pipes writing sequence. We want to assume that the write below could
|
|
|
|
# block, e.g. if fast-import blocks writing its own output to &9
|
|
|
|
# because there is no reader on &9 yet.
|
|
|
|
(
|
|
|
|
cat "$input_file"
|
|
|
|
echo "checkpoint"
|
|
|
|
echo "progress checkpoint"
|
|
|
|
) >&8 &
|
|
|
|
|
|
|
|
error=1 ;# assume the worst
|
|
|
|
while read output <&9
|
|
|
|
do
|
|
|
|
if test "$output" = "progress checkpoint"
|
|
|
|
then
|
|
|
|
error=0
|
|
|
|
break
|
t9300-fast-import: don't hang if background fast-import exits too early
The five tests checking 'git fast-import's checkpoint handling in
't9300-fast-import.sh', all with the prefix "V:" in their test
description, can hang indefinitely if 'git fast-import' unexpectedly
dies early in any of these tests.
These five tests run 'git fast-import' in the background, while
feeding instructions to its standard input through a fifo (fd 8) from
a background subshell, and reading and verifying its standard output
through another fifo (fd 9) in the test script's main shell process.
This "reading and verifying" is basically a 'while read ...' shell
loop iterating until 'git fast-import' outputs the expected line,
ignoring any other output. This doesn't work very well when 'git
fast-import' dies before printing that particular line, because the
'read' builtin doesn't get EOF after the death of 'git fast-import',
as their input and output are not connected directly but through a
fifo. Consequently, that 'read' hangs waiting for the next line from
the already dead 'git fast-import', leaving the test script and in
turn the whole test suite hanging.
Avoid this hang by checking whether the background 'git fast-import'
process exited unexpectedly early, and interrupt the 'while read' loop
if it did. We have to jump through some hoops to achive that, though:
- Start the background 'git fast-import' in another background
subshell, which then:
- prints the PID of that 'git fast-import' process to the fifo,
to be read by the main shell process, so it will know which
process to kill when the test is finished.
- waits until that 'git fast-import' process exits. If it does
exit, then report its exit code, and write a message to the
fifo used for 'git fast-import's standard output, thus
un-block the 'read' builtin in the main shell process.
- Modify that 'while read' loop to break the loop upon seeing that
message, and fail the test in the usual way.
- Once the test is finished kill that background subshell as well,
and do so before killing the background 'git fast-import'.
Otherwise the background 'git fast-import' and subshell processes
would die racily, and if 'git fast-import' were to die sooner,
then we might get some undesired and potentially confusing
messages in the test's output.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-12-07 03:03:31 +08:00
|
|
|
elif test "$output" = "UNEXPECTED"
|
|
|
|
then
|
|
|
|
break
|
2017-09-29 11:09:36 +08:00
|
|
|
fi
|
|
|
|
# otherwise ignore cruft
|
|
|
|
echo >&2 "cruft: $output"
|
|
|
|
done
|
|
|
|
|
|
|
|
if test $error -eq 1
|
|
|
|
then
|
|
|
|
false
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
background_import_still_running () {
|
2019-12-07 03:03:30 +08:00
|
|
|
if ! kill -0 "$fi_pid"
|
2017-09-29 11:09:36 +08:00
|
|
|
then
|
|
|
|
echo >&2 "background fast-import terminated too early"
|
|
|
|
false
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success PIPE 'V: checkpoint helper does not get stuck with extra output' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
progress foo
|
|
|
|
progress bar
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
background_import_then_checkpoint "" input &&
|
|
|
|
background_import_still_running
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success PIPE 'V: checkpoint updates refs after reset' '
|
|
|
|
cat >input <<-\INPUT_END &&
|
|
|
|
reset refs/heads/V
|
|
|
|
from refs/heads/U
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
background_import_then_checkpoint "" input &&
|
|
|
|
test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
|
|
|
|
background_import_still_running
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success PIPE 'V: checkpoint updates refs and marks after commit' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/V
|
|
|
|
mark :1
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data 0
|
|
|
|
from refs/heads/U
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
background_import_then_checkpoint "--export-marks=marks.actual" input &&
|
|
|
|
|
|
|
|
echo ":1 $(git rev-parse --verify V)" >marks.expected &&
|
|
|
|
|
|
|
|
test "$(git rev-parse --verify V^)" = "$(git rev-parse --verify U)" &&
|
|
|
|
test_cmp marks.expected marks.actual &&
|
|
|
|
background_import_still_running
|
|
|
|
'
|
|
|
|
|
|
|
|
# Re-create the exact same commit, but on a different branch: no new object is
|
|
|
|
# created in the database, but the refs and marks still need to be updated.
|
|
|
|
test_expect_success PIPE 'V: checkpoint updates refs and marks after commit (no new objects)' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/V2
|
|
|
|
mark :2
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data 0
|
|
|
|
from refs/heads/U
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
background_import_then_checkpoint "--export-marks=marks.actual" input &&
|
|
|
|
|
|
|
|
echo ":2 $(git rev-parse --verify V2)" >marks.expected &&
|
|
|
|
|
|
|
|
test "$(git rev-parse --verify V2)" = "$(git rev-parse --verify V)" &&
|
|
|
|
test_cmp marks.expected marks.actual &&
|
|
|
|
background_import_still_running
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success PIPE 'V: checkpoint updates tags after tag' '
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
tag Vtag
|
|
|
|
from refs/heads/V
|
|
|
|
tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
data 0
|
|
|
|
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
background_import_then_checkpoint "" input &&
|
|
|
|
git show-ref -d Vtag &&
|
|
|
|
background_import_still_running
|
|
|
|
'
|
|
|
|
|
2019-02-21 06:58:42 +08:00
|
|
|
###
|
|
|
|
### series W (get-mark and empty orphan commits)
|
|
|
|
###
|
|
|
|
|
|
|
|
cat >>W-input <<-W_INPUT_END
|
|
|
|
commit refs/heads/W-branch
|
|
|
|
mark :1
|
|
|
|
author Full Name <user@company.tld> 1000000000 +0100
|
|
|
|
committer Full Name <user@company.tld> 1000000000 +0100
|
|
|
|
data 27
|
|
|
|
Intentionally empty commit
|
|
|
|
LFsget-mark :1
|
|
|
|
W_INPUT_END
|
|
|
|
|
2019-02-21 06:58:46 +08:00
|
|
|
test_expect_success !MINGW 'W: get-mark & empty orphan commit with no newlines' '
|
2019-02-21 06:58:42 +08:00
|
|
|
sed -e s/LFs// W-input | tr L "\n" | git fast-import
|
|
|
|
'
|
|
|
|
|
2019-02-21 06:58:46 +08:00
|
|
|
test_expect_success !MINGW 'W: get-mark & empty orphan commit with one newline' '
|
2019-02-21 06:58:42 +08:00
|
|
|
sed -e s/LFs/L/ W-input | tr L "\n" | git fast-import
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success !MINGW 'W: get-mark & empty orphan commit with ugly second newline' '
|
|
|
|
# Technically, this should fail as it has too many linefeeds
|
|
|
|
# according to the grammar in fast-import.txt. But, for whatever
|
|
|
|
# reason, it works. Since using the correct number of newlines
|
|
|
|
# does not work with older (pre-2.22) versions of git, allow apps
|
|
|
|
# that used this second-newline workaround to keep working by
|
|
|
|
# checking it with this test...
|
|
|
|
sed -e s/LFs/LL/ W-input | tr L "\n" | git fast-import
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success !MINGW 'W: get-mark & empty orphan commit with erroneous third newline' '
|
|
|
|
# ...but do NOT allow more empty lines than that (see previous test).
|
|
|
|
sed -e s/LFs/LLL/ W-input | tr L "\n" | test_must_fail git fast-import
|
|
|
|
'
|
|
|
|
|
2019-05-14 12:30:59 +08:00
|
|
|
###
|
|
|
|
### series X (other new features)
|
|
|
|
###
|
|
|
|
|
|
|
|
test_expect_success 'X: handling encoding' '
|
|
|
|
test_tick &&
|
|
|
|
cat >input <<-INPUT_END &&
|
|
|
|
commit refs/heads/encoding
|
|
|
|
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
|
|
|
|
encoding iso-8859-7
|
|
|
|
data <<COMMIT
|
|
|
|
INPUT_END
|
|
|
|
|
|
|
|
printf "Pi: \360\nCOMMIT\n" >>input &&
|
|
|
|
|
|
|
|
git fast-import <input &&
|
|
|
|
git cat-file -p encoding | grep $(printf "\360") &&
|
|
|
|
git log -1 --format=%B encoding | grep $(printf "\317\200")
|
|
|
|
'
|
|
|
|
|
fast-import: add options for rewriting submodules
When converting a repository using submodules from one hash algorithm to
another, it is necessary to rewrite the submodules from the old
algorithm to the new algorithm, since only references to submodules, not
their contents, are written to the fast-export stream. Without rewriting
the submodules, fast-import fails with an "Invalid dataref" error when
encountering a submodule in another algorithm.
Add a pair of options, --rewrite-submodules-from and
--rewrite-submodules-to, that take a list of marks produced by
fast-export and fast-import, respectively, when processing the
submodule. Use these marks to map the submodule commits from the old
algorithm to the new algorithm.
We read marks into two corresponding struct mark_set objects and then
perform a mapping from the old to the new using a hash table. This lets
us reuse the same mark parsing code that is used elsewhere and allows us
to efficiently read and match marks based on their ID, since mark files
need not be sorted.
Note that because we're using a khash table for the object IDs, and this
table copies values of struct object_id instead of taking references to
them, it's necessary to zero the struct object_id values that we use to
insert and look up in the table. Otherwise, we would end up with SHA-1
values that don't match because of whatever stack garbage might be left
in the unused area.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 04:17:49 +08:00
|
|
|
###
|
|
|
|
### series Y (submodules and hash algorithms)
|
|
|
|
###
|
|
|
|
|
|
|
|
cat >Y-sub-input <<\Y_INPUT_END
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data 4
|
|
|
|
foo
|
|
|
|
|
2020-11-19 07:44:42 +08:00
|
|
|
reset refs/heads/main
|
|
|
|
commit refs/heads/main
|
fast-import: add options for rewriting submodules
When converting a repository using submodules from one hash algorithm to
another, it is necessary to rewrite the submodules from the old
algorithm to the new algorithm, since only references to submodules, not
their contents, are written to the fast-export stream. Without rewriting
the submodules, fast-import fails with an "Invalid dataref" error when
encountering a submodule in another algorithm.
Add a pair of options, --rewrite-submodules-from and
--rewrite-submodules-to, that take a list of marks produced by
fast-export and fast-import, respectively, when processing the
submodule. Use these marks to map the submodule commits from the old
algorithm to the new algorithm.
We read marks into two corresponding struct mark_set objects and then
perform a mapping from the old to the new using a hash table. This lets
us reuse the same mark parsing code that is used elsewhere and allows us
to efficiently read and match marks based on their ID, since mark files
need not be sorted.
Note that because we're using a khash table for the object IDs, and this
table copies values of struct object_id instead of taking references to
them, it's necessary to zero the struct object_id values that we use to
insert and look up in the table. Otherwise, we would end up with SHA-1
values that don't match because of whatever stack garbage might be left
in the unused area.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 04:17:49 +08:00
|
|
|
mark :2
|
|
|
|
author Full Name <user@company.tld> 1000000000 +0100
|
|
|
|
committer Full Name <user@company.tld> 1000000000 +0100
|
|
|
|
data 24
|
|
|
|
Test submodule commit 1
|
|
|
|
M 100644 :1 file
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :3
|
|
|
|
data 8
|
|
|
|
foo
|
|
|
|
bar
|
|
|
|
|
2020-11-19 07:44:42 +08:00
|
|
|
commit refs/heads/main
|
fast-import: add options for rewriting submodules
When converting a repository using submodules from one hash algorithm to
another, it is necessary to rewrite the submodules from the old
algorithm to the new algorithm, since only references to submodules, not
their contents, are written to the fast-export stream. Without rewriting
the submodules, fast-import fails with an "Invalid dataref" error when
encountering a submodule in another algorithm.
Add a pair of options, --rewrite-submodules-from and
--rewrite-submodules-to, that take a list of marks produced by
fast-export and fast-import, respectively, when processing the
submodule. Use these marks to map the submodule commits from the old
algorithm to the new algorithm.
We read marks into two corresponding struct mark_set objects and then
perform a mapping from the old to the new using a hash table. This lets
us reuse the same mark parsing code that is used elsewhere and allows us
to efficiently read and match marks based on their ID, since mark files
need not be sorted.
Note that because we're using a khash table for the object IDs, and this
table copies values of struct object_id instead of taking references to
them, it's necessary to zero the struct object_id values that we use to
insert and look up in the table. Otherwise, we would end up with SHA-1
values that don't match because of whatever stack garbage might be left
in the unused area.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 04:17:49 +08:00
|
|
|
mark :4
|
|
|
|
author Full Name <user@company.tld> 1000000001 +0100
|
|
|
|
committer Full Name <user@company.tld> 1000000001 +0100
|
|
|
|
data 24
|
|
|
|
Test submodule commit 2
|
|
|
|
from :2
|
|
|
|
M 100644 :3 file
|
|
|
|
Y_INPUT_END
|
|
|
|
|
|
|
|
# Note that the submodule object IDs are intentionally not translated.
|
|
|
|
cat >Y-main-input <<\Y_INPUT_END
|
|
|
|
blob
|
|
|
|
mark :1
|
|
|
|
data 4
|
|
|
|
foo
|
|
|
|
|
2020-11-19 07:44:42 +08:00
|
|
|
reset refs/heads/main
|
|
|
|
commit refs/heads/main
|
fast-import: add options for rewriting submodules
When converting a repository using submodules from one hash algorithm to
another, it is necessary to rewrite the submodules from the old
algorithm to the new algorithm, since only references to submodules, not
their contents, are written to the fast-export stream. Without rewriting
the submodules, fast-import fails with an "Invalid dataref" error when
encountering a submodule in another algorithm.
Add a pair of options, --rewrite-submodules-from and
--rewrite-submodules-to, that take a list of marks produced by
fast-export and fast-import, respectively, when processing the
submodule. Use these marks to map the submodule commits from the old
algorithm to the new algorithm.
We read marks into two corresponding struct mark_set objects and then
perform a mapping from the old to the new using a hash table. This lets
us reuse the same mark parsing code that is used elsewhere and allows us
to efficiently read and match marks based on their ID, since mark files
need not be sorted.
Note that because we're using a khash table for the object IDs, and this
table copies values of struct object_id instead of taking references to
them, it's necessary to zero the struct object_id values that we use to
insert and look up in the table. Otherwise, we would end up with SHA-1
values that don't match because of whatever stack garbage might be left
in the unused area.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 04:17:49 +08:00
|
|
|
mark :2
|
|
|
|
author Full Name <user@company.tld> 2000000000 +0100
|
|
|
|
committer Full Name <user@company.tld> 2000000000 +0100
|
|
|
|
data 14
|
|
|
|
Test commit 1
|
|
|
|
M 100644 :1 file
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :3
|
|
|
|
data 73
|
|
|
|
[submodule "sub1"]
|
|
|
|
path = sub1
|
|
|
|
url = https://void.example.com/main.git
|
|
|
|
|
2020-11-19 07:44:42 +08:00
|
|
|
commit refs/heads/main
|
fast-import: add options for rewriting submodules
When converting a repository using submodules from one hash algorithm to
another, it is necessary to rewrite the submodules from the old
algorithm to the new algorithm, since only references to submodules, not
their contents, are written to the fast-export stream. Without rewriting
the submodules, fast-import fails with an "Invalid dataref" error when
encountering a submodule in another algorithm.
Add a pair of options, --rewrite-submodules-from and
--rewrite-submodules-to, that take a list of marks produced by
fast-export and fast-import, respectively, when processing the
submodule. Use these marks to map the submodule commits from the old
algorithm to the new algorithm.
We read marks into two corresponding struct mark_set objects and then
perform a mapping from the old to the new using a hash table. This lets
us reuse the same mark parsing code that is used elsewhere and allows us
to efficiently read and match marks based on their ID, since mark files
need not be sorted.
Note that because we're using a khash table for the object IDs, and this
table copies values of struct object_id instead of taking references to
them, it's necessary to zero the struct object_id values that we use to
insert and look up in the table. Otherwise, we would end up with SHA-1
values that don't match because of whatever stack garbage might be left
in the unused area.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 04:17:49 +08:00
|
|
|
mark :4
|
|
|
|
author Full Name <user@company.tld> 2000000001 +0100
|
|
|
|
committer Full Name <user@company.tld> 2000000001 +0100
|
|
|
|
data 14
|
|
|
|
Test commit 2
|
|
|
|
from :2
|
|
|
|
M 100644 :3 .gitmodules
|
|
|
|
M 160000 0712c5be7cf681388e355ef47525aaf23aee1a6d sub1
|
|
|
|
|
|
|
|
blob
|
|
|
|
mark :5
|
|
|
|
data 8
|
|
|
|
foo
|
|
|
|
bar
|
|
|
|
|
2020-11-19 07:44:42 +08:00
|
|
|
commit refs/heads/main
|
fast-import: add options for rewriting submodules
When converting a repository using submodules from one hash algorithm to
another, it is necessary to rewrite the submodules from the old
algorithm to the new algorithm, since only references to submodules, not
their contents, are written to the fast-export stream. Without rewriting
the submodules, fast-import fails with an "Invalid dataref" error when
encountering a submodule in another algorithm.
Add a pair of options, --rewrite-submodules-from and
--rewrite-submodules-to, that take a list of marks produced by
fast-export and fast-import, respectively, when processing the
submodule. Use these marks to map the submodule commits from the old
algorithm to the new algorithm.
We read marks into two corresponding struct mark_set objects and then
perform a mapping from the old to the new using a hash table. This lets
us reuse the same mark parsing code that is used elsewhere and allows us
to efficiently read and match marks based on their ID, since mark files
need not be sorted.
Note that because we're using a khash table for the object IDs, and this
table copies values of struct object_id instead of taking references to
them, it's necessary to zero the struct object_id values that we use to
insert and look up in the table. Otherwise, we would end up with SHA-1
values that don't match because of whatever stack garbage might be left
in the unused area.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 04:17:49 +08:00
|
|
|
mark :6
|
|
|
|
author Full Name <user@company.tld> 2000000002 +0100
|
|
|
|
committer Full Name <user@company.tld> 2000000002 +0100
|
|
|
|
data 14
|
|
|
|
Test commit 3
|
|
|
|
from :4
|
|
|
|
M 100644 :5 file
|
|
|
|
M 160000 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7 sub1
|
|
|
|
Y_INPUT_END
|
|
|
|
|
|
|
|
cat >Y-marks <<\Y_INPUT_END
|
|
|
|
:2 0712c5be7cf681388e355ef47525aaf23aee1a6d
|
|
|
|
:4 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7
|
|
|
|
Y_INPUT_END
|
|
|
|
|
|
|
|
test_expect_success 'Y: setup' '
|
|
|
|
test_oid_cache <<-EOF
|
2020-11-19 07:44:42 +08:00
|
|
|
Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
|
|
|
|
Ymain sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3
|
fast-import: add options for rewriting submodules
When converting a repository using submodules from one hash algorithm to
another, it is necessary to rewrite the submodules from the old
algorithm to the new algorithm, since only references to submodules, not
their contents, are written to the fast-export stream. Without rewriting
the submodules, fast-import fails with an "Invalid dataref" error when
encountering a submodule in another algorithm.
Add a pair of options, --rewrite-submodules-from and
--rewrite-submodules-to, that take a list of marks produced by
fast-export and fast-import, respectively, when processing the
submodule. Use these marks to map the submodule commits from the old
algorithm to the new algorithm.
We read marks into two corresponding struct mark_set objects and then
perform a mapping from the old to the new using a hash table. This lets
us reuse the same mark parsing code that is used elsewhere and allows us
to efficiently read and match marks based on their ID, since mark files
need not be sorted.
Note that because we're using a khash table for the object IDs, and this
table copies values of struct object_id instead of taking references to
them, it's necessary to zero the struct object_id values that we use to
insert and look up in the table. Otherwise, we would end up with SHA-1
values that don't match because of whatever stack garbage might be left
in the unused area.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 04:17:49 +08:00
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'Y: rewrite submodules' '
|
|
|
|
git init main1 &&
|
|
|
|
(
|
|
|
|
cd main1 &&
|
|
|
|
git init sub2 &&
|
|
|
|
git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input &&
|
|
|
|
git fast-import --rewrite-submodules-from=sub:../Y-marks \
|
|
|
|
--rewrite-submodules-to=sub:sub2-marks <../Y-main-input &&
|
2020-11-19 07:44:42 +08:00
|
|
|
test "$(git rev-parse main)" = "$(test_oid Ymain)"
|
fast-import: add options for rewriting submodules
When converting a repository using submodules from one hash algorithm to
another, it is necessary to rewrite the submodules from the old
algorithm to the new algorithm, since only references to submodules, not
their contents, are written to the fast-export stream. Without rewriting
the submodules, fast-import fails with an "Invalid dataref" error when
encountering a submodule in another algorithm.
Add a pair of options, --rewrite-submodules-from and
--rewrite-submodules-to, that take a list of marks produced by
fast-export and fast-import, respectively, when processing the
submodule. Use these marks to map the submodule commits from the old
algorithm to the new algorithm.
We read marks into two corresponding struct mark_set objects and then
perform a mapping from the old to the new using a hash table. This lets
us reuse the same mark parsing code that is used elsewhere and allows us
to efficiently read and match marks based on their ID, since mark files
need not be sorted.
Note that because we're using a khash table for the object IDs, and this
table copies values of struct object_id instead of taking references to
them, it's necessary to zero the struct object_id values that we use to
insert and look up in the table. Otherwise, we would end up with SHA-1
values that don't match because of whatever stack garbage might be left
in the unused area.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-23 04:17:49 +08:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2007-01-19 02:26:24 +08:00
|
|
|
test_done
|