Adding upstream version 1:2.39.2.upstream/1%2.39.2upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 334 insertions, 0 deletions

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
new file mode 100755
index 0000000..fea41b3
--- /dev/null
+++ b/t/t9100-git-svn-basic.sh
@@ -0,0 +1,334 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Eric Wong
+#
+
+test_description='git svn basic tests'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./lib-git-svn.sh
+
+prepare_utf8_locale
+
+test_expect_success 'git svn --version works anywhere' '
+	nongit git svn --version
+'
+
+test_expect_success 'git svn help works anywhere' '
+	nongit git svn help
+'
+
+test_expect_success \
+    'initialize git svn' '
+	mkdir import &&
+	(
+		cd import &&
+		echo foo >foo &&
+		ln -s foo foo.link &&
+		mkdir -p dir/a/b/c/d/e &&
+		echo "deep dir" >dir/a/b/c/d/e/file &&
+		mkdir bar &&
+		echo "zzz" >bar/zzz &&
+		echo "#!/bin/sh" >exec.sh &&
+		chmod +x exec.sh &&
+		svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
+	) &&
+	rm -rf import &&
+	git svn init "$svnrepo"'
+
+test_expect_success \
+    'import an SVN revision into git' \
+    'git svn fetch'
+
+test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"'
+
+name='try a deep --rmdir with a commit'
+test_expect_success "$name" '
+	git checkout -f -b mybranch remotes/git-svn &&
+	mv dir/a/b/c/d/e/file dir/file &&
+	cp dir/file file &&
+	git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch &&
+	svn_cmd up "$SVN_TREE" &&
+	test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a'
+
+
+name='detect node change from file to directory #1'
+test_expect_success "$name" '
+	mkdir dir/new_file &&
+	mv dir/file dir/new_file/file &&
+	mv dir/new_file dir/file &&
+	git update-index --remove dir/file &&
+	git update-index --add dir/file/file &&
+	git commit -m "$name" &&
+	test_must_fail git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch
+'
+
+
+name='detect node change from directory to file #1'
+test_expect_success "$name" '
+	rm -rf dir "$GIT_DIR"/index &&
+	git checkout -f -b mybranch2 remotes/git-svn &&
+	mv bar/zzz zzz &&
+	rm -rf bar &&
+	mv zzz bar &&
+	git update-index --remove -- bar/zzz &&
+	git update-index --add -- bar &&
+	git commit -m "$name" &&
+	test_must_fail git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch2
+'
+
+
+name='detect node change from file to directory #2'
+test_expect_success "$name" '
+	rm -f "$GIT_DIR"/index &&
+	git checkout -f -b mybranch3 remotes/git-svn &&
+	rm bar/zzz &&
+	git update-index --remove bar/zzz &&
+	mkdir bar/zzz &&
+	echo yyy > bar/zzz/yyy &&
+	git update-index --add bar/zzz/yyy &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch3 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -d "$SVN_TREE"/bar/zzz &&
+	test -e "$SVN_TREE"/bar/zzz/yyy
+'
+
+name='detect node change from directory to file #2'
+test_expect_success "$name" '
+	rm -f "$GIT_DIR"/index &&
+	git checkout -f -b mybranch4 remotes/git-svn &&
+	rm -rf dir &&
+	git update-index --remove -- dir/file &&
+	touch dir &&
+	echo asdf > dir &&
+	git update-index --add -- dir &&
+	git commit -m "$name" &&
+	test_must_fail git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch4
+'
+
+
+name='remove executable bit from a file'
+test_expect_success POSIXPERM "$name" '
+	rm -f "$GIT_DIR"/index &&
+	git checkout -f -b mybranch5 remotes/git-svn &&
+	chmod -x exec.sh &&
+	git update-index exec.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test ! -x "$SVN_TREE"/exec.sh'
+
+
+name='add executable bit back file'
+test_expect_success POSIXPERM "$name" '
+	chmod +x exec.sh &&
+	git update-index exec.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -x "$SVN_TREE"/exec.sh'
+
+
+name='executable file becomes a symlink to file'
+test_expect_success SYMLINKS "$name" '
+	rm exec.sh &&
+	ln -s file exec.sh &&
+	git update-index exec.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -h "$SVN_TREE"/exec.sh'
+
+name='new symlink is added to a file that was also just made executable'
+
+test_expect_success POSIXPERM,SYMLINKS "$name" '
+	chmod +x file &&
+	ln -s file exec-2.sh &&
+	git update-index --add file exec-2.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -x "$SVN_TREE"/file &&
+	test -h "$SVN_TREE"/exec-2.sh'
+
+name='modify a symlink to become a file'
+test_expect_success POSIXPERM,SYMLINKS "$name" '
+	echo git help >help &&
+	rm exec-2.sh &&
+	cp help exec-2.sh &&
+	git update-index exec-2.sh &&
+	git commit -m "$name" &&
+	git svn set-tree --find-copies-harder --rmdir \
+		remotes/git-svn..mybranch5 &&
+	svn_cmd up "$SVN_TREE" &&
+	test -f "$SVN_TREE"/exec-2.sh &&
+	test ! -h "$SVN_TREE"/exec-2.sh &&
+	test_cmp help "$SVN_TREE"/exec-2.sh'
+
+name="commit with UTF-8 message: locale: $GIT_TEST_UTF8_LOCALE"
+LC_ALL="$GIT_TEST_UTF8_LOCALE"
+export LC_ALL
+# This test relies on the previous test, hence requires POSIXPERM,SYMLINKS
+test_expect_success UTF8,POSIXPERM,SYMLINKS "$name" "
+	echo '# hello' >> exec-2.sh &&
+	git update-index exec-2.sh &&
+	git commit -m 'éï∏' &&
+	git svn set-tree HEAD"
+unset LC_ALL
+
+name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
+GIT_SVN_ID=alt
+export GIT_SVN_ID
+test_expect_success "$name" \
+    'git svn init "$svnrepo" && git svn fetch &&
+     git log --format="tree %T %s" remotes/git-svn |
+	awk "!seen[\$0]++ { print \$1, \$2 }" >a &&
+     git log --format="tree %T" alt >b &&
+     test_cmp a b'
+
+name='check imported tree checksums expected tree checksums'
+rm -f expected
+if test_have_prereq UTF8
+then
+	echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected.sha1
+	echo tree b95b55b29d771f5eb73aa9b9d52d02fe11a2538c2feb0829f754ce20a91d98eb > expected.sha256
+fi
+cat >> expected.sha1 <<\EOF
+tree c3322890dcf74901f32d216f05c5044f670ce632
+tree d3ccd5035feafd17b030c5732e7808cc49122853
+tree d03e1630363d4881e68929d532746b20b0986b83
+tree 149d63cd5878155c846e8c55d7d8487de283f89e
+tree 312b76e4f64ce14893aeac8591eb3960b065e247
+tree 149d63cd5878155c846e8c55d7d8487de283f89e
+tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
+tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
+EOF
+cat >> expected.sha256 <<\EOF
+tree 8d12756699d0b5b110514240a0ff141f6cbf8891fd69ab05e5594196fb437c9f
+tree 8187168d33f7d4ccb8c1cc6e99532810aaccb47658f35d19b3803072d1128d7a
+tree 74e535d85da8ee25eb23d7b506790c5ab3ccdb1ba0826bd57625ed44ef361650
+tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95
+tree 1fd6cec6aa95102d69266e20419bb62ec2a06372d614b9850ef23ff204103bb4
+tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95
+tree deb2b7ac79cd8ce6f52af6a5a0a08691e94ba74a2ed55966bb27dbec551730eb
+tree 59e2e936761188476a7752034e8aa0a822b34050c8504b0dfd946407f4bc9215
+EOF
+
+test_expect_success POSIXPERM,SYMLINKS "$name" '
+	test_cmp expected.$(test_oid algo) a
+'
+
+test_expect_success 'exit if remote refs are ambigious' '
+        git config --add svn-remote.svn.fetch \
+		bar:refs/remotes/git-svn &&
+	test_must_fail git svn migrate
+'
+
+test_expect_success 'exit if init-ing a would clobber a URL' '
+        svnadmin create "${PWD}/svnrepo2" &&
+        svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
+        git config --unset svn-remote.svn.fetch \
+		"^bar:refs/remotes/git-svn$" &&
+	test_must_fail git svn init "${svnrepo}2/bar"
+        '
+
+test_expect_success \
+  'init allows us to connect to another directory in the same repo' '
+        git svn init --minimize-url -i bar "$svnrepo/bar" &&
+        git config --get svn-remote.svn.fetch \
+                              "^bar:refs/remotes/bar$" &&
+        git config --get svn-remote.svn.fetch \
+			      "^:refs/remotes/git-svn$"
+        '
+
+test_expect_success 'dcommit $rev does not clobber current branch' '
+	git svn fetch -i bar &&
+	git checkout -b my-bar refs/remotes/bar &&
+	echo 1 > foo &&
+	git add foo &&
+	git commit -m "change 1" &&
+	echo 2 > foo &&
+	git add foo &&
+	git commit -m "change 2" &&
+	old_head=$(git rev-parse HEAD) &&
+	git svn dcommit -i bar HEAD^ &&
+	test $old_head = $(git rev-parse HEAD) &&
+	test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
+	git log refs/remotes/bar | grep "change 1" &&
+	! git log refs/remotes/bar | grep "change 2" &&
+	git checkout main &&
+	git branch -D my-bar
+	'
+
+test_expect_success 'able to dcommit to a subdirectory' '
+	git svn fetch -i bar &&
+	git checkout -b my-bar refs/remotes/bar &&
+	echo abc > d &&
+	git update-index --add d &&
+	git commit -m "/bar/d should be in the log" &&
+	git svn dcommit -i bar &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
+	mkdir newdir &&
+	echo new > newdir/dir &&
+	git update-index --add newdir/dir &&
+	git commit -m "add a new directory" &&
+	git svn dcommit -i bar &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
+	echo foo >> newdir/dir &&
+	git update-index newdir/dir &&
+	git commit -m "modify a file in new directory" &&
+	git svn dcommit -i bar &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
+'
+
+test_expect_success 'dcommit should not fail with a touched file' '
+	test_commit "commit-new-file-foo2" foo2 &&
+	test-tool chmtime =-60 foo &&
+	git svn dcommit
+'
+
+test_expect_success 'rebase should not fail with a touched file' '
+	test-tool chmtime =-60 foo &&
+	git svn rebase
+'
+
+test_expect_success 'able to set-tree to a subdirectory' '
+	echo cba > d &&
+	git update-index d &&
+	git commit -m "update /bar/d" &&
+	git svn set-tree -i bar HEAD &&
+	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
+'
+
+test_expect_success 'git-svn works in a bare repository' '
+	mkdir bare-repo &&
+	( cd bare-repo &&
+	git init --bare &&
+	GIT_DIR=. git svn init "$svnrepo" &&
+	git svn fetch ) &&
+	rm -rf bare-repo
+	'
+test_expect_success 'git-svn works in a repository with a gitdir: link' '
+	mkdir worktree gitdir &&
+	( cd worktree &&
+	git svn init "$svnrepo" &&
+	git init --separate-git-dir ../gitdir &&
+	git svn fetch ) &&
+	rm -rf worktree gitdir
+	'
+
+test_done