Staging
v0.5.1
v0.5.1
Revision 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC, committed by Junio C Hamano on 20 January 2022, 23:25:38 UTC
"git branch -h" incorrectly said "--track[=direct|inherit]", implying that "--trackinherit" is a valid option, which has been corrected. source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com> source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de> * js/branch-track-inherit: branch,checkout: fix --track documentation
t9167-git-svn-cmd-branch-subproject.sh
#!/bin/sh
#
# Copyright (c) 2013 Tobias Schulte
#
test_description='git svn branch for subproject clones'
TEST_PASSES_SANITIZE_LEAK=true
. ./lib-git-svn.sh
test_expect_success 'initialize svnrepo' '
mkdir import &&
(
cd import &&
mkdir -p trunk/project branches tags &&
(
cd trunk/project &&
echo foo > foo
) &&
svn_cmd import -m "import for git-svn" . "$svnrepo" >/dev/null
) &&
rm -rf import &&
svn_cmd co "$svnrepo"/trunk/project trunk/project &&
(
cd trunk/project &&
echo bar >> foo &&
svn_cmd ci -m "updated trunk"
) &&
rm -rf trunk
'
test_expect_success 'import into git' '
git svn init --trunk=trunk/project --branches=branches/*/project \
--tags=tags/*/project "$svnrepo" &&
git svn fetch &&
git checkout remotes/origin/trunk
'
test_expect_success 'git svn branch tests' '
test_must_fail git svn branch a &&
git svn branch --parents a &&
test_must_fail git svn branch -t tag1 &&
git svn branch --parents -t tag1 &&
test_must_fail git svn branch --tag tag2 &&
git svn branch --parents --tag tag2 &&
test_must_fail git svn tag tag3 &&
git svn tag --parents tag3
'
test_done
Computing file changes ...