mirror of
https://github.com/git/git.git
synced 2024-05-27 14:36:11 +02:00
11cbda2add
The name of the primary branch in existing repositories, and the default name used for the first branch in newly created repositories, is made configurable, so that we can eventually wean ourselves off of the hardcoded 'master'. * js/default-branch-name: contrib: subtree: adjust test to change in fmt-merge-msg testsvn: respect `init.defaultBranch` remote: use the configured default branch name when appropriate clone: use configured default branch name when appropriate init: allow setting the default for the initial branch name via the config init: allow specifying the initial branch name for the new repository docs: add missing diamond brackets submodule: fall back to remote's HEAD for missing remote.<name>.branch send-pack/transport-helper: avoid mentioning a particular branch fmt-merge-msg: stop treating `master` specially
96 lines
2.5 KiB
Bash
Executable File
96 lines
2.5 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='tests remote-svn'
|
|
|
|
. ./test-lib.sh
|
|
|
|
MARKSPATH=.git/info/fast-import/remote-svn
|
|
|
|
if ! test_have_prereq PYTHON
|
|
then
|
|
skip_all='skipping remote-svn tests, python not available'
|
|
test_done
|
|
fi
|
|
|
|
# Override svnrdump with our simulator
|
|
PATH="$HOME:$PATH"
|
|
export PATH PYTHON_PATH GIT_BUILD_DIR
|
|
|
|
write_script "$HOME/svnrdump" <<\EOF
|
|
exec "$PYTHON_PATH" "$GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py" "$@"
|
|
EOF
|
|
|
|
init_git () {
|
|
rm -fr .git &&
|
|
git init &&
|
|
#git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump
|
|
# let's reuse an existing dump file!?
|
|
git remote add svnsim "testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump"
|
|
git remote add svnfile "testsvn::file://$TEST_DIRECTORY/t9154/svn.dump"
|
|
}
|
|
|
|
if test -e "$GIT_BUILD_DIR/git-remote-testsvn"
|
|
then
|
|
test_set_prereq REMOTE_SVN
|
|
fi
|
|
|
|
test_debug '
|
|
git --version
|
|
type git
|
|
type svnrdump
|
|
'
|
|
|
|
test_expect_success REMOTE_SVN 'simple fetch' '
|
|
init_git &&
|
|
git fetch svnsim &&
|
|
test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master &&
|
|
cp .git/refs/remotes/svnsim/master master.good
|
|
'
|
|
|
|
test_debug '
|
|
git show-ref -s refs/svn/svnsim/master
|
|
git show-ref -s refs/remotes/svnsim/master
|
|
'
|
|
|
|
test_expect_success REMOTE_SVN 'repeated fetch, nothing shall change' '
|
|
git fetch svnsim &&
|
|
test_cmp master.good .git/refs/remotes/svnsim/master
|
|
'
|
|
|
|
test_expect_success REMOTE_SVN 'fetch from a file:// url gives the same result' '
|
|
git fetch svnfile
|
|
'
|
|
|
|
test_expect_failure REMOTE_SVN 'the sha1 differ because the git-svn-id line in the commit msg contains the url' '
|
|
test_cmp .git/refs/remotes/svnfile/master .git/refs/remotes/svnsim/master
|
|
'
|
|
|
|
test_expect_success REMOTE_SVN 'mark-file regeneration' '
|
|
# filter out any other marks, that can not be regenerated. Only up to 3 digit revisions are allowed here
|
|
grep ":[0-9]\{1,3\} " $MARKSPATH/svnsim.marks > $MARKSPATH/svnsim.marks.old &&
|
|
rm $MARKSPATH/svnsim.marks &&
|
|
git fetch svnsim &&
|
|
test_cmp $MARKSPATH/svnsim.marks.old $MARKSPATH/svnsim.marks
|
|
'
|
|
|
|
test_expect_success REMOTE_SVN 'incremental imports must lead to the same head' '
|
|
SVNRMAX=3 &&
|
|
export SVNRMAX &&
|
|
init_git &&
|
|
git fetch svnsim &&
|
|
test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master &&
|
|
unset SVNRMAX &&
|
|
git fetch svnsim &&
|
|
test_cmp master.good .git/refs/remotes/svnsim/master
|
|
'
|
|
|
|
test_expect_success REMOTE_SVN 'respects configured default initial branch' '
|
|
git -c init.defaultBranch=trunk remote add -f trunk \
|
|
"testsvn::file://$TEST_DIRECTORY/t9154/svn.dump" &&
|
|
git rev-parse --verify refs/remotes/trunk/trunk
|
|
'
|
|
|
|
test_debug 'git branch -a'
|
|
|
|
test_done
|