merge(third_party/git): Merge squashed git subtree at v2.23.0
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
Vincent Ambo
commit
7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
228
third_party/git/t/t9104-git-svn-follow-parent.sh
vendored
Executable file
228
third_party/git/t/t9104-git-svn-follow-parent.sh
vendored
Executable file
|
|
@ -0,0 +1,228 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git svn fetching'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'initialize repo' '
|
||||
mkdir import &&
|
||||
(
|
||||
cd import &&
|
||||
mkdir -p trunk &&
|
||||
echo hello >trunk/readme &&
|
||||
svn_cmd import -m "initial" . "$svnrepo"
|
||||
) &&
|
||||
svn_cmd co "$svnrepo" wc &&
|
||||
(
|
||||
cd wc &&
|
||||
echo world >>trunk/readme &&
|
||||
poke trunk/readme &&
|
||||
svn_cmd commit -m "another commit" &&
|
||||
svn_cmd up &&
|
||||
svn_cmd mv trunk thunk &&
|
||||
echo goodbye >>thunk/readme &&
|
||||
poke thunk/readme &&
|
||||
svn_cmd commit -m "bye now"
|
||||
)
|
||||
'
|
||||
|
||||
test_expect_success 'init and fetch a moved directory' '
|
||||
git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
|
||||
git svn fetch -i thunk &&
|
||||
test "$(git rev-parse --verify refs/remotes/thunk@2)" \
|
||||
= "$(git rev-parse --verify refs/remotes/thunk~1)" &&
|
||||
git cat-file blob refs/remotes/thunk:readme >actual &&
|
||||
test "$(sed -n -e "3p" actual)" = goodbye &&
|
||||
test -z "$(git config --get svn-remote.svn.fetch \
|
||||
"^trunk:refs/remotes/thunk@2$")"
|
||||
'
|
||||
|
||||
test_expect_success 'init and fetch from one svn-remote' '
|
||||
git config svn-remote.svn.url "$svnrepo" &&
|
||||
git config --add svn-remote.svn.fetch \
|
||||
trunk:refs/remotes/svn/trunk &&
|
||||
git config --add svn-remote.svn.fetch \
|
||||
thunk:refs/remotes/svn/thunk &&
|
||||
git svn fetch -i svn/thunk &&
|
||||
test "$(git rev-parse --verify refs/remotes/svn/trunk)" \
|
||||
= "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
|
||||
git cat-file blob refs/remotes/svn/thunk:readme >actual &&
|
||||
test "$(sed -n -e "3p" actual)" = goodbye
|
||||
'
|
||||
|
||||
test_expect_success 'follow deleted parent' '
|
||||
(svn_cmd cp -m "resurrecting trunk as junk" \
|
||||
"$svnrepo"/trunk@2 "$svnrepo"/junk ||
|
||||
svn cp -m "resurrecting trunk as junk" \
|
||||
-r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
|
||||
git config --add svn-remote.svn.fetch \
|
||||
junk:refs/remotes/svn/junk &&
|
||||
git svn fetch -i svn/thunk &&
|
||||
git svn fetch -i svn/junk &&
|
||||
test -z "$(git diff svn/junk svn/trunk)" &&
|
||||
test "$(git merge-base svn/junk svn/trunk)" \
|
||||
= "$(git rev-parse svn/trunk)"
|
||||
'
|
||||
|
||||
test_expect_success 'follow larger parent' '
|
||||
mkdir -p import/trunk/thunk/bump/thud &&
|
||||
echo hi > import/trunk/thunk/bump/thud/file &&
|
||||
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
|
||||
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
|
||||
git svn init --minimize-url -i larger \
|
||||
"$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
|
||||
git svn fetch -i larger &&
|
||||
git svn init --minimize-url -i larger-parent \
|
||||
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
|
||||
git svn fetch -i larger-parent &&
|
||||
git rev-parse --verify refs/remotes/larger &&
|
||||
git rev-parse --verify \
|
||||
refs/remotes/larger-parent &&
|
||||
test "$(git merge-base \
|
||||
refs/remotes/larger-parent \
|
||||
refs/remotes/larger)" = \
|
||||
"$(git rev-parse refs/remotes/larger)"
|
||||
'
|
||||
|
||||
test_expect_success 'follow higher-level parent' '
|
||||
svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&
|
||||
svn co "$svnrepo"/blob blob &&
|
||||
(
|
||||
cd blob &&
|
||||
echo hi > hi &&
|
||||
svn add hi &&
|
||||
svn commit -m "hihi"
|
||||
) &&
|
||||
svn mkdir -m "new glob at top level" "$svnrepo"/glob &&
|
||||
svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob &&
|
||||
git svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
|
||||
git svn fetch -i blob
|
||||
'
|
||||
|
||||
test_expect_success 'follow deleted directory' '
|
||||
svn_cmd mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
|
||||
svn_cmd rm -m "remove glob" "$svnrepo"/glob &&
|
||||
git svn init --minimize-url -i glob "$svnrepo"/glob &&
|
||||
git svn fetch -i glob &&
|
||||
test "$(git cat-file blob refs/remotes/glob:blob/bye)" = hi &&
|
||||
git ls-tree refs/remotes/glob >actual &&
|
||||
test_line_count = 1 actual
|
||||
'
|
||||
|
||||
# ref: r9270 of the Subversion repository: (http://svn.collab.net/repos/svn)
|
||||
# in trunk/subversion/bindings/swig/perl
|
||||
test_expect_success 'follow-parent avoids deleting relevant info' '
|
||||
mkdir -p import/trunk/subversion/bindings/swig/perl/t &&
|
||||
for i in a b c ; do \
|
||||
echo $i > import/trunk/subversion/bindings/swig/perl/$i.pm &&
|
||||
echo _$i > import/trunk/subversion/bindings/swig/perl/t/$i.t; \
|
||||
done &&
|
||||
echo "bad delete test" > \
|
||||
import/trunk/subversion/bindings/swig/perl/t/larger-parent &&
|
||||
echo "bad delete test 2" > \
|
||||
import/trunk/subversion/bindings/swig/perl/another-larger &&
|
||||
(
|
||||
cd import &&
|
||||
svn import -m "r9270 test" . "$svnrepo"/r9270
|
||||
) &&
|
||||
svn_cmd co "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl r9270 &&
|
||||
(
|
||||
cd r9270 &&
|
||||
svn mkdir native &&
|
||||
svn mv t native/t &&
|
||||
for i in a b c
|
||||
do
|
||||
svn mv $i.pm native/$i.pm
|
||||
done &&
|
||||
echo z >>native/t/c.t &&
|
||||
poke native/t/c.t &&
|
||||
svn commit -m "reorg test"
|
||||
) &&
|
||||
git svn init --minimize-url -i r9270-t \
|
||||
"$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
|
||||
git svn fetch -i r9270-t &&
|
||||
test $(git rev-list r9270-t | wc -l) -eq 2 &&
|
||||
test "$(git ls-tree --name-only r9270-t~1)" = \
|
||||
"$(git ls-tree --name-only r9270-t)"
|
||||
'
|
||||
|
||||
test_expect_success "track initial change if it was only made to parent" '
|
||||
svn_cmd cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
|
||||
git svn init --minimize-url -i r9270-d \
|
||||
"$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
|
||||
git svn fetch -i r9270-d &&
|
||||
test $(git rev-list r9270-d | wc -l) -eq 3 &&
|
||||
test "$(git ls-tree --name-only r9270-t)" = \
|
||||
"$(git ls-tree --name-only r9270-d)" &&
|
||||
test "$(git rev-parse r9270-t)" = \
|
||||
"$(git rev-parse r9270-d~1)"
|
||||
'
|
||||
|
||||
test_expect_success "follow-parent is atomic" '
|
||||
(
|
||||
cd wc &&
|
||||
svn_cmd up &&
|
||||
svn_cmd mkdir stunk &&
|
||||
echo "trunk stunk" > stunk/readme &&
|
||||
svn_cmd add stunk/readme &&
|
||||
svn_cmd ci -m "trunk stunk" &&
|
||||
echo "stunk like junk" >> stunk/readme &&
|
||||
svn_cmd ci -m "really stunk" &&
|
||||
echo "stink stank stunk" >> stunk/readme &&
|
||||
svn_cmd ci -m "even the grinch agrees"
|
||||
) &&
|
||||
svn_cmd copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk &&
|
||||
{ svn cp -m "early stunk flunked too" \
|
||||
"$svnrepo"/stunk@17 "$svnrepo"/flunked ||
|
||||
svn_cmd cp -m "early stunk flunked too" \
|
||||
-r17 "$svnrepo"/stunk "$svnrepo"/flunked; } &&
|
||||
git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
|
||||
git svn fetch -i stunk &&
|
||||
git update-ref refs/remotes/flunk@18 refs/remotes/stunk~2 &&
|
||||
git update-ref -d refs/remotes/stunk &&
|
||||
git config --unset svn-remote.svn.fetch stunk &&
|
||||
mkdir -p "$GIT_DIR"/svn/refs/remotes/flunk@18 &&
|
||||
rev_map=$(cd "$GIT_DIR"/svn/refs/remotes/stunk && ls .rev_map*) &&
|
||||
dd if="$GIT_DIR"/svn/refs/remotes/stunk/$rev_map \
|
||||
of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 &&
|
||||
rm -rf "$GIT_DIR"/svn/refs/remotes/stunk &&
|
||||
git svn init --minimize-url -i flunk "$svnrepo"/flunk &&
|
||||
git svn fetch -i flunk &&
|
||||
git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
|
||||
git svn fetch -i stunk &&
|
||||
git svn init --minimize-url -i flunked "$svnrepo"/flunked &&
|
||||
git svn fetch -i flunked &&
|
||||
test "$(git rev-parse --verify refs/remotes/flunk@18)" \
|
||||
= "$(git rev-parse --verify refs/remotes/stunk)" &&
|
||||
test "$(git rev-parse --verify refs/remotes/flunk~1)" \
|
||||
= "$(git rev-parse --verify refs/remotes/stunk)" &&
|
||||
test "$(git rev-parse --verify refs/remotes/flunked~1)" \
|
||||
= "$(git rev-parse --verify refs/remotes/stunk~1)"
|
||||
'
|
||||
|
||||
test_expect_success "track multi-parent paths" '
|
||||
svn_cmd cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
|
||||
git svn multi-fetch &&
|
||||
git cat-file commit refs/remotes/glob >actual &&
|
||||
grep "^parent " actual >actual2 &&
|
||||
test_line_count = 2 actual2
|
||||
'
|
||||
|
||||
test_expect_success "multi-fetch continues to work" "
|
||||
git svn multi-fetch
|
||||
"
|
||||
|
||||
test_expect_success "multi-fetch works off a 'clean' repository" '
|
||||
rm -rf "$GIT_DIR/svn" &&
|
||||
git for-each-ref --format="option no-deref%0adelete %(refname)" refs/remotes |
|
||||
git update-ref --stdin &&
|
||||
git reflog expire --all --expire=all &&
|
||||
mkdir "$GIT_DIR/svn" &&
|
||||
git svn multi-fetch
|
||||
'
|
||||
|
||||
test_debug 'gitk --all &'
|
||||
|
||||
test_done
|
||||
Loading…
Add table
Add a link
Reference in a new issue