mirror of
https://github.com/git/git.git
synced 2024-11-27 12:03:55 +08:00
remote-testgit: exercise more features
Unfortunately a lot of these tests fail. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3808b8515b
commit
ee10fbf90c
@ -6,17 +6,25 @@ url=$2
|
||||
|
||||
dir="$GIT_DIR/testgit/$alias"
|
||||
prefix="refs/testgit/$alias"
|
||||
refspec="refs/heads/*:${prefix}/heads/*"
|
||||
|
||||
gitmarks="$dir/git.marks"
|
||||
testgitmarks="$dir/testgit.marks"
|
||||
default_refspec="refs/heads/*:${prefix}/heads/*"
|
||||
|
||||
refspec="${GIT_REMOTE_TESTGIT_REFSPEC-$default_refspec}"
|
||||
|
||||
test -z "$refspec" && prefix="refs"
|
||||
|
||||
export GIT_DIR="$url/.git"
|
||||
|
||||
mkdir -p "$dir"
|
||||
|
||||
test -e "$gitmarks" || > "$gitmarks"
|
||||
test -e "$testgitmarks" || > "$testgitmarks"
|
||||
if test -z "$GIT_REMOTE_TESTGIT_NO_MARKS"
|
||||
then
|
||||
gitmarks="$dir/git.marks"
|
||||
testgitmarks="$dir/testgit.marks"
|
||||
test -e "$gitmarks" || >"$gitmarks"
|
||||
test -e "$testgitmarks" || >"$testgitmarks"
|
||||
testgitmarks_args=( "--"{import,export}"-marks=$testgitmarks" )
|
||||
fi
|
||||
|
||||
while read line
|
||||
do
|
||||
@ -24,9 +32,12 @@ do
|
||||
capabilities)
|
||||
echo 'import'
|
||||
echo 'export'
|
||||
echo "refspec $refspec"
|
||||
echo "*import-marks $gitmarks"
|
||||
echo "*export-marks $gitmarks"
|
||||
test -n "$refspec" && echo "refspec $refspec"
|
||||
if test -n "$gitmarks"
|
||||
then
|
||||
echo "*import-marks $gitmarks"
|
||||
echo "*export-marks $gitmarks"
|
||||
fi
|
||||
echo
|
||||
;;
|
||||
list)
|
||||
@ -45,13 +56,16 @@ do
|
||||
test "${line%% *}" != "import" && break
|
||||
done
|
||||
|
||||
echo "feature import-marks=$gitmarks"
|
||||
echo "feature export-marks=$gitmarks"
|
||||
git fast-export --use-done-feature --{import,export}-marks="$testgitmarks" $refs |
|
||||
if test -n "$gitmarks"
|
||||
then
|
||||
echo "feature import-marks=$gitmarks"
|
||||
echo "feature export-marks=$gitmarks"
|
||||
fi
|
||||
git fast-export --use-done-feature "${testgitmarks_args[@]}" $refs |
|
||||
sed -e "s#refs/heads/#${prefix}/heads/#g"
|
||||
;;
|
||||
export)
|
||||
git fast-import --{import,export}-marks="$testgitmarks" --quiet
|
||||
git fast-import "${testgitmarks_args[@]}" --quiet
|
||||
echo
|
||||
;;
|
||||
'')
|
||||
|
@ -110,4 +110,56 @@ test_expect_failure 'push new branch with old:new refspec' '
|
||||
compare_refs local HEAD server refs/heads/new-refspec
|
||||
'
|
||||
|
||||
test_expect_success 'cloning without refspec' '
|
||||
GIT_REMOTE_TESTGIT_REFSPEC="" \
|
||||
git clone "testgit::${PWD}/server" local2 &&
|
||||
compare_refs local2 HEAD server HEAD
|
||||
'
|
||||
|
||||
test_expect_success 'pulling without refspecs' '
|
||||
(cd local2 &&
|
||||
git reset --hard &&
|
||||
GIT_REMOTE_TESTGIT_REFSPEC="" git pull) &&
|
||||
compare_refs local2 HEAD server HEAD
|
||||
'
|
||||
|
||||
test_expect_failure 'pushing without refspecs' '
|
||||
test_when_finished "(cd local2 && git reset --hard origin)" &&
|
||||
(cd local2 &&
|
||||
echo content >>file &&
|
||||
git commit -a -m ten &&
|
||||
GIT_REMOTE_TESTGIT_REFSPEC="" git push) &&
|
||||
compare_refs local2 HEAD server HEAD
|
||||
'
|
||||
|
||||
test_expect_success 'pulling with straight refspec' '
|
||||
(cd local2 &&
|
||||
GIT_REMOTE_TESTGIT_REFSPEC="*:*" git pull) &&
|
||||
compare_refs local2 HEAD server HEAD
|
||||
'
|
||||
|
||||
test_expect_failure 'pushing with straight refspec' '
|
||||
test_when_finished "(cd local2 && git reset --hard origin)" &&
|
||||
(cd local2 &&
|
||||
echo content >>file &&
|
||||
git commit -a -m eleven &&
|
||||
GIT_REMOTE_TESTGIT_REFSPEC="*:*" git push) &&
|
||||
compare_refs local2 HEAD server HEAD
|
||||
'
|
||||
|
||||
test_expect_success 'pulling without marks' '
|
||||
(cd local2 &&
|
||||
GIT_REMOTE_TESTGIT_NO_MARKS=1 git pull) &&
|
||||
compare_refs local2 HEAD server HEAD
|
||||
'
|
||||
|
||||
test_expect_failure 'pushing without marks' '
|
||||
test_when_finished "(cd local2 && git reset --hard origin)" &&
|
||||
(cd local2 &&
|
||||
echo content >>file &&
|
||||
git commit -a -m twelve &&
|
||||
GIT_REMOTE_TESTGIT_NO_MARKS=1 git push) &&
|
||||
compare_refs local2 HEAD server HEAD
|
||||
'
|
||||
|
||||
test_done
|
||||
|
Loading…
Reference in New Issue
Block a user