b4b872994b
When a remote helper exports to a non-local git repo, the
steps are roughly:
1. fast-export into a local staging area; the set of
interesting refs is defined by what is in the fast-export
stream
2. git push from the staging area to the non-local repo
In the second step, we should explicitly push all refs, not
just matching ones. This will let us push refs that do not
yet exist in the remote repo.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
136 lines
2.9 KiB
Bash
Executable File
136 lines
2.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2010 Sverre Rabbelier
|
|
#
|
|
|
|
test_description='Test remote-helper import and export commands'
|
|
|
|
. ./test-lib.sh
|
|
|
|
if ! test_have_prereq PYTHON ; then
|
|
skip_all='skipping git-remote-hg tests, python not available'
|
|
test_done
|
|
fi
|
|
|
|
"$PYTHON_PATH" -c '
|
|
import sys
|
|
if sys.hexversion < 0x02040000:
|
|
sys.exit(1)
|
|
' || {
|
|
skip_all='skipping git-remote-hg tests, python version < 2.4'
|
|
test_done
|
|
}
|
|
|
|
compare_refs() {
|
|
git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
|
|
git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
test_expect_success 'setup repository' '
|
|
git init --bare server/.git &&
|
|
git clone server public &&
|
|
(cd public &&
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -m one &&
|
|
git push origin master)
|
|
'
|
|
|
|
test_expect_success 'cloning from local repo' '
|
|
git clone "testgit::${PWD}/server" localclone &&
|
|
test_cmp public/file localclone/file
|
|
'
|
|
|
|
test_expect_success 'cloning from remote repo' '
|
|
git clone "testgit::file://${PWD}/server" clone &&
|
|
test_cmp public/file clone/file
|
|
'
|
|
|
|
test_expect_success 'create new commit on remote' '
|
|
(cd public &&
|
|
echo content >>file &&
|
|
git commit -a -m two &&
|
|
git push)
|
|
'
|
|
|
|
test_expect_success 'pulling from local repo' '
|
|
(cd localclone && git pull) &&
|
|
test_cmp public/file localclone/file
|
|
'
|
|
|
|
test_expect_success 'pulling from remote remote' '
|
|
(cd clone && git pull) &&
|
|
test_cmp public/file clone/file
|
|
'
|
|
|
|
test_expect_success 'pushing to local repo' '
|
|
(cd localclone &&
|
|
echo content >>file &&
|
|
git commit -a -m three &&
|
|
git push) &&
|
|
compare_refs localclone HEAD server HEAD
|
|
'
|
|
|
|
test_expect_success 'synch with changes from localclone' '
|
|
(cd clone &&
|
|
git pull)
|
|
'
|
|
|
|
test_expect_success 'pushing remote local repo' '
|
|
(cd clone &&
|
|
echo content >>file &&
|
|
git commit -a -m four &&
|
|
git push) &&
|
|
compare_refs clone HEAD server HEAD
|
|
'
|
|
|
|
test_expect_success 'fetch new branch' '
|
|
(cd public &&
|
|
git checkout -b new &&
|
|
echo content >>file &&
|
|
git commit -a -m five &&
|
|
git push origin new
|
|
) &&
|
|
(cd localclone &&
|
|
git fetch origin new
|
|
) &&
|
|
compare_refs public HEAD localclone FETCH_HEAD
|
|
'
|
|
|
|
test_expect_failure 'fetch multiple branches' '
|
|
(cd localclone &&
|
|
git fetch
|
|
) &&
|
|
compare_refs server master localclone refs/remotes/origin/master &&
|
|
compare_refs server new localclone refs/remotes/origin/new
|
|
'
|
|
|
|
test_expect_success 'push when remote has extra refs' '
|
|
(cd clone &&
|
|
echo content >>file &&
|
|
git commit -a -m six &&
|
|
git push
|
|
) &&
|
|
compare_refs clone master server master
|
|
'
|
|
|
|
test_expect_success 'push new branch by name' '
|
|
(cd clone &&
|
|
git checkout -b new-name &&
|
|
echo content >>file &&
|
|
git commit -a -m seven &&
|
|
git push origin new-name
|
|
) &&
|
|
compare_refs clone HEAD server refs/heads/new-name
|
|
'
|
|
|
|
test_expect_failure 'push new branch with old:new refspec' '
|
|
(cd clone &&
|
|
git push origin new-name:new-refspec
|
|
) &&
|
|
compare_refs clone HEAD server refs/heads/new-refspec
|
|
'
|
|
|
|
test_done
|