Staging
v0.5.1
v0.5.1
https://github.com/git/git
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
Tip revision: 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC
Merge branch 'js/branch-track-inherit'
Merge branch 'js/branch-track-inherit'
Tip revision: 297ca89
t9156-git-svn-fetch-deleted-tag-2.sh
#!/bin/sh
test_description='git svn fetch deleted tag 2'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./lib-git-svn.sh
test_expect_success 'setup svn repo' '
mkdir -p import/branches &&
mkdir -p import/tags &&
mkdir -p import/trunk/subdir1 &&
mkdir -p import/trunk/subdir2 &&
mkdir -p import/trunk/subdir3 &&
echo "file1" >import/trunk/subdir1/file &&
echo "file2" >import/trunk/subdir2/file &&
echo "file3" >import/trunk/subdir3/file &&
svn_cmd import -m "import for git svn" import "$svnrepo" &&
rm -rf import &&
svn_cmd co "$svnrepo/trunk" svn_project &&
(cd svn_project &&
echo "change1" >>subdir1/file &&
echo "change2" >>subdir2/file &&
echo "change3" >>subdir3/file &&
svn_cmd ci -m "change" .
) &&
svn_cmd cp -m "create mytag 1" -r2 "$svnrepo/trunk/subdir1" "$svnrepo/tags/mytag" &&
svn_cmd rm -m "delete mytag 1" "$svnrepo/tags/mytag" &&
svn_cmd cp -m "create mytag 2" -r2 "$svnrepo/trunk/subdir2" "$svnrepo/tags/mytag" &&
svn_cmd rm -m "delete mytag 2" "$svnrepo/tags/mytag" &&
svn_cmd cp -m "create mytag 3" -r2 "$svnrepo/trunk/subdir3" "$svnrepo/tags/mytag"
'
test_expect_success 'fetch deleted tags from same revision with no checksum error' '
git svn init --stdlayout "$svnrepo" git_project &&
cd git_project &&
git svn fetch &&
git diff --exit-code main:subdir3/file origin/tags/mytag:file &&
git diff --exit-code main:subdir2/file origin/tags/mytag^:file &&
git diff --exit-code main:subdir1/file origin/tags/mytag^^:file
'
test_done
Computing file changes ...