[thirdparty/git.git] / t / t9100-git-svn-basic.sh

#!/bin/sh
#
# Copyright (c) 2006 Eric Wong
#

test_description='git svn basic tests'
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}

. ./lib-git-svn.sh

case "$GIT_SVN_LC_ALL" in
*.UTF-8)
	test_set_prereq UTF8
	;;
*)
	say "# UTF-8 locale not set, some tests skipped ($GIT_SVN_LC_ALL)"
	;;
esac

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_SVN_LC_ALL"
LC_ALL="$GIT_SVN_LC_ALL"
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 rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
     git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > 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 master &&
	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 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
Commit	Line	Data
96a40b27 EW	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2006 Eric Wong
	4	#
	5
1364ff27	6	test_description='git svn basic tests'
952182b5	7	GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
dc62e25c	8
7b7247b0 JS	9	. ./lib-git-svn.sh
7b7247b0 JS	10
952182b5	11	case "$GIT_SVN_LC_ALL" in
dc62e25c	12	*.UTF-8)
7b7247b0	13	test_set_prereq UTF8
dc62e25c EW	14	;;
dc62e25c EW	15	*)
fadb5156	16	say "# UTF-8 locale not set, some tests skipped ($GIT_SVN_LC_ALL)"
dc62e25c EW	17	;;
	18	esac
	19
c0071ae5	20	test_expect_success 'git svn --version works anywhere' '
a3c45d12	21	nongit git svn --version
c0071ae5 EW	22	'
	23
	24	test_expect_success 'git svn help works anywhere' '
a3c45d12	25	nongit git svn help
c0071ae5 EW	26	'
c0071ae5 EW	27
96a40b27	28	test_expect_success \
f964732c	29	'initialize git svn' '
39ed7c18	30	mkdir import &&
18a82692 JN	31	(
	32	cd import &&
	33	echo foo >foo &&
cff4243d	34	ln -s foo foo.link &&
18a82692 JN	35	mkdir -p dir/a/b/c/d/e &&
	36	echo "deep dir" >dir/a/b/c/d/e/file &&
	37	mkdir bar &&
	38	echo "zzz" >bar/zzz &&
2605e959 MG	39	echo "#!/bin/sh" >exec.sh &&
2605e959 MG	40	chmod +x exec.sh &&
18a82692	41	svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
fd4ec4f2	42	) &&
39ed7c18	43	rm -rf import &&
1364ff27	44	git svn init "$svnrepo"'
96a40b27 EW	45
	46	test_expect_success \
	47	'import an SVN revision into git' \
1364ff27	48	'git svn fetch'
96a40b27	49
f69e836f	50	test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"'
96a40b27 EW	51
96a40b27 EW	52	name='try a deep --rmdir with a commit'
f69e836f	53	test_expect_success "$name" '
e1c0c158	54	git checkout -f -b mybranch remotes/git-svn &&
39ed7c18 EW	55	mv dir/a/b/c/d/e/file dir/file &&
	56	cp dir/file file &&
	57	git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
f69e836f	58	git commit -m "$name" &&
1364ff27	59	git svn set-tree --find-copies-harder --rmdir \
e1c0c158	60	remotes/git-svn..mybranch &&
da083d68	61	svn_cmd up "$SVN_TREE" &&
f69e836f	62	test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a'
96a40b27 EW	63
	64
	65	name='detect node change from file to directory #1'
41ac414e	66	test_expect_success "$name" "
39ed7c18 EW	67	mkdir dir/new_file &&
	68	mv dir/file dir/new_file/file &&
	69	mv dir/new_file dir/file &&
	70	git update-index --remove dir/file &&
	71	git update-index --add dir/file/file &&
41ac414e	72	git commit -m '$name' &&
1364ff27	73	test_must_fail git svn set-tree --find-copies-harder --rmdir \
e1c0c158	74	remotes/git-svn..mybranch
2ab5ca80	75	"
96a40b27 EW	76
	77
	78	name='detect node change from directory to file #1'
f69e836f BD	79	test_expect_success "$name" '
f69e836f BD	80	rm -rf dir "$GIT_DIR"/index &&
e1c0c158	81	git checkout -f -b mybranch2 remotes/git-svn &&
39ed7c18 EW	82	mv bar/zzz zzz &&
	83	rm -rf bar &&
	84	mv zzz bar &&
	85	git update-index --remove -- bar/zzz &&
	86	git update-index --add -- bar &&
f69e836f	87	git commit -m "$name" &&
1364ff27	88	test_must_fail git svn set-tree --find-copies-harder --rmdir \
e1c0c158	89	remotes/git-svn..mybranch2
2ab5ca80	90	'
96a40b27 EW	91
	92
	93	name='detect node change from file to directory #2'
f69e836f BD	94	test_expect_success "$name" '
f69e836f BD	95	rm -f "$GIT_DIR"/index &&
e1c0c158	96	git checkout -f -b mybranch3 remotes/git-svn &&
39ed7c18	97	rm bar/zzz &&
5be60078	98	git update-index --remove bar/zzz &&
39ed7c18 EW	99	mkdir bar/zzz &&
39ed7c18 EW	100	echo yyy > bar/zzz/yyy &&
5be60078	101	git update-index --add bar/zzz/yyy &&
f69e836f	102	git commit -m "$name" &&
379862ec	103	git svn set-tree --find-copies-harder --rmdir \
e1c0c158	104	remotes/git-svn..mybranch3 &&
379862ec SW	105	svn_cmd up "$SVN_TREE" &&
379862ec SW	106	test -d "$SVN_TREE"/bar/zzz &&
2ab5ca80 JH	107	test -e "$SVN_TREE"/bar/zzz/yyy
2ab5ca80 JH	108	'
96a40b27 EW	109
96a40b27 EW	110	name='detect node change from directory to file #2'
f69e836f BD	111	test_expect_success "$name" '
f69e836f BD	112	rm -f "$GIT_DIR"/index &&
e1c0c158	113	git checkout -f -b mybranch4 remotes/git-svn &&
39ed7c18 EW	114	rm -rf dir &&
	115	git update-index --remove -- dir/file &&
	116	touch dir &&
	117	echo asdf > dir &&
	118	git update-index --add -- dir &&
f69e836f	119	git commit -m "$name" &&
1364ff27	120	test_must_fail git svn set-tree --find-copies-harder --rmdir \
e1c0c158	121	remotes/git-svn..mybranch4
2ab5ca80	122	'
96a40b27 EW	123
	124
	125	name='remove executable bit from a file'
bcb11f19	126	test_expect_success POSIXPERM "$name" '
f69e836f	127	rm -f "$GIT_DIR"/index &&
e1c0c158	128	git checkout -f -b mybranch5 remotes/git-svn &&
39ed7c18 EW	129	chmod -x exec.sh &&
39ed7c18 EW	130	git update-index exec.sh &&
f69e836f	131	git commit -m "$name" &&
1364ff27	132	git svn set-tree --find-copies-harder --rmdir \
e1c0c158	133	remotes/git-svn..mybranch5 &&
da083d68	134	svn_cmd up "$SVN_TREE" &&
f69e836f	135	test ! -x "$SVN_TREE"/exec.sh'
96a40b27 EW	136
	137
	138	name='add executable bit back file'
bcb11f19	139	test_expect_success POSIXPERM "$name" '
39ed7c18 EW	140	chmod +x exec.sh &&
39ed7c18 EW	141	git update-index exec.sh &&
f69e836f	142	git commit -m "$name" &&
1364ff27	143	git svn set-tree --find-copies-harder --rmdir \
e1c0c158	144	remotes/git-svn..mybranch5 &&
da083d68	145	svn_cmd up "$SVN_TREE" &&
f69e836f	146	test -x "$SVN_TREE"/exec.sh'
96a40b27 EW	147
96a40b27 EW	148
379862ec	149	name='executable file becomes a symlink to file'
bcb11f19	150	test_expect_success SYMLINKS "$name" '
5bd3870c	151	rm exec.sh &&
379862ec	152	ln -s file exec.sh &&
5bd3870c	153	git update-index exec.sh &&
f69e836f	154	git commit -m "$name" &&
1364ff27	155	git svn set-tree --find-copies-harder --rmdir \
e1c0c158	156	remotes/git-svn..mybranch5 &&
da083d68	157	svn_cmd up "$SVN_TREE" &&
afa08760	158	test -h "$SVN_TREE"/exec.sh'
0e8a002c	159
5bd3870c	160	name='new symlink is added to a file that was also just made executable'
0e8a002c	161
bcb11f19	162	test_expect_success POSIXPERM,SYMLINKS "$name" '
379862ec SW	163	chmod +x file &&
	164	ln -s file exec-2.sh &&
	165	git update-index --add file exec-2.sh &&
f69e836f	166	git commit -m "$name" &&
1364ff27	167	git svn set-tree --find-copies-harder --rmdir \
e1c0c158	168	remotes/git-svn..mybranch5 &&
da083d68	169	svn_cmd up "$SVN_TREE" &&
379862ec	170	test -x "$SVN_TREE"/file &&
afa08760	171	test -h "$SVN_TREE"/exec-2.sh'
96a40b27	172
5bd3870c	173	name='modify a symlink to become a file'
bcb11f19	174	test_expect_success POSIXPERM,SYMLINKS "$name" '
2ab5ca80	175	echo git help >help &&
5bd3870c EW	176	rm exec-2.sh &&
	177	cp help exec-2.sh &&
	178	git update-index exec-2.sh &&
f69e836f	179	git commit -m "$name" &&
1364ff27	180	git svn set-tree --find-copies-harder --rmdir \
e1c0c158	181	remotes/git-svn..mybranch5 &&
da083d68	182	svn_cmd up "$SVN_TREE" &&
f69e836f	183	test -f "$SVN_TREE"/exec-2.sh &&
afa08760	184	test ! -h "$SVN_TREE"/exec-2.sh &&
3af82863	185	test_cmp help "$SVN_TREE"/exec-2.sh'
96a40b27	186
7b7247b0 JS	187	name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
	188	LC_ALL="$GIT_SVN_LC_ALL"
	189	export LC_ALL
bcb11f19 JS	190	# This test relies on the previous test, hence requires POSIXPERM,SYMLINKS
bcb11f19 JS	191	test_expect_success UTF8,POSIXPERM,SYMLINKS "$name" "
7b7247b0 JS	192	echo '# hello' >> exec-2.sh &&
	193	git update-index exec-2.sh &&
	194	git commit -m 'éï∏' &&
	195	git svn set-tree HEAD"
	196	unset LC_ALL
96a40b27 EW	197
	198	name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
	199	GIT_SVN_ID=alt
	200	export GIT_SVN_ID
	201	test_expect_success "$name" \
1364ff27	202	'git svn init "$svnrepo" && git svn fetch &&
e1c0c158	203	git rev-list --pretty=raw remotes/git-svn \| grep ^tree \| uniq > a &&
5be60078	204	git rev-list --pretty=raw remotes/alt \| grep ^tree \| uniq > b &&
3af82863	205	test_cmp a b'
96a40b27	206
42d32870	207	name='check imported tree checksums expected tree checksums'
86f36379	208	rm -f expected
7b7247b0	209	if test_have_prereq UTF8
86f36379	210	then
407527ba	211	echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected.sha1
407527ba	212	echo tree b95b55b29d771f5eb73aa9b9d52d02fe11a2538c2feb0829f754ce20a91d98eb > expected.sha256
86f36379	213	fi
407527ba	214	cat >> expected.sha1 <<\EOF
379862ec SW	215	tree c3322890dcf74901f32d216f05c5044f670ce632
	216	tree d3ccd5035feafd17b030c5732e7808cc49122853
	217	tree d03e1630363d4881e68929d532746b20b0986b83
	218	tree 149d63cd5878155c846e8c55d7d8487de283f89e
	219	tree 312b76e4f64ce14893aeac8591eb3960b065e247
	220	tree 149d63cd5878155c846e8c55d7d8487de283f89e
42d32870 EW	221	tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
	222	tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
	223	EOF
407527ba	224	cat >> expected.sha256 <<\EOF
	225	tree 8d12756699d0b5b110514240a0ff141f6cbf8891fd69ab05e5594196fb437c9f
	226	tree 8187168d33f7d4ccb8c1cc6e99532810aaccb47658f35d19b3803072d1128d7a
	227	tree 74e535d85da8ee25eb23d7b506790c5ab3ccdb1ba0826bd57625ed44ef361650
	228	tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95
	229	tree 1fd6cec6aa95102d69266e20419bb62ec2a06372d614b9850ef23ff204103bb4
	230	tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95
	231	tree deb2b7ac79cd8ce6f52af6a5a0a08691e94ba74a2ed55966bb27dbec551730eb
	232	tree 59e2e936761188476a7752034e8aa0a822b34050c8504b0dfd946407f4bc9215
	233	EOF
e1516119	234
407527ba	235	test_expect_success POSIXPERM,SYMLINKS "$name" '
	236	test_cmp expected.$(test_oid algo) a
	237	'
42d32870	238
577dfd03	239	test_expect_success 'exit if remote refs are ambigious' '
5be60078	240	git config --add svn-remote.svn.fetch \
e1c0c158	241	bar:refs/remotes/git-svn &&
1364ff27	242	test_must_fail git svn migrate
577dfd03	243	'
e6434f87	244
f69e836f BD	245	test_expect_success 'exit if init-ing a would clobber a URL' '
	246	svnadmin create "${PWD}/svnrepo2" &&
	247	svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
5be60078	248	git config --unset svn-remote.svn.fetch \
e1c0c158	249	"^bar:refs/remotes/git-svn$" &&
1364ff27	250	test_must_fail git svn init "${svnrepo}2/bar"
f69e836f	251	'
e6434f87 EW	252
e6434f87 EW	253	test_expect_success \
f69e836f	254	'init allows us to connect to another directory in the same repo' '
1364ff27	255	git svn init --minimize-url -i bar "$svnrepo/bar" &&
ccb6b6f5	256	git config --get svn-remote.svn.fetch \
f69e836f	257	"^bar:refs/remotes/bar$" &&
ccb6b6f5	258	git config --get svn-remote.svn.fetch \
e1c0c158	259	"^:refs/remotes/git-svn$"
f69e836f	260	'
b805b44a	261
5eec27e3 TR	262	test_expect_success 'dcommit $rev does not clobber current branch' '
	263	git svn fetch -i bar &&
	264	git checkout -b my-bar refs/remotes/bar &&
	265	echo 1 > foo &&
	266	git add foo &&
	267	git commit -m "change 1" &&
	268	echo 2 > foo &&
	269	git add foo &&
	270	git commit -m "change 2" &&
	271	old_head=$(git rev-parse HEAD) &&
	272	git svn dcommit -i bar HEAD^ &&
	273	test $old_head = $(git rev-parse HEAD) &&
	274	test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
	275	git log refs/remotes/bar \| grep "change 1" &&
	276	! git log refs/remotes/bar \| grep "change 2" &&
	277	git checkout master &&
	278	git branch -D my-bar
	279	'
	280
577dfd03	281	test_expect_success 'able to dcommit to a subdirectory' '
1364ff27	282	git svn fetch -i bar &&
d3a840dc EW	283	git checkout -b my-bar refs/remotes/bar &&
	284	echo abc > d &&
	285	git update-index --add d &&
577dfd03	286	git commit -m "/bar/d should be in the log" &&
1364ff27	287	git svn dcommit -i bar &&
577dfd03	288	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
d3a840dc EW	289	mkdir newdir &&
	290	echo new > newdir/dir &&
	291	git update-index --add newdir/dir &&
577dfd03	292	git commit -m "add a new directory" &&
1364ff27	293	git svn dcommit -i bar &&
577dfd03	294	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)" &&
d3a840dc EW	295	echo foo >> newdir/dir &&
d3a840dc EW	296	git update-index newdir/dir &&
577dfd03	297	git commit -m "modify a file in new directory" &&
1364ff27	298	git svn dcommit -i bar &&
577dfd03 JK	299	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
577dfd03 JK	300	'
d3a840dc	301
181264ad DK	302	test_expect_success 'dcommit should not fail with a touched file' '
181264ad DK	303	test_commit "commit-new-file-foo2" foo2 &&
0e496492	304	test-tool chmtime =-60 foo &&
181264ad DK	305	git svn dcommit
	306	'
	307
	308	test_expect_success 'rebase should not fail with a touched file' '
0e496492	309	test-tool chmtime =-60 foo &&
181264ad DK	310	git svn rebase
	311	'
	312
577dfd03	313	test_expect_success 'able to set-tree to a subdirectory' '
d3a840dc EW	314	echo cba > d &&
d3a840dc EW	315	git update-index d &&
577dfd03	316	git commit -m "update /bar/d" &&
1364ff27	317	git svn set-tree -i bar HEAD &&
577dfd03 JK	318	test -z "$(git diff refs/heads/my-bar refs/remotes/bar)"
577dfd03 JK	319	'
d3a840dc	320
6e5121f2 DM	321	test_expect_success 'git-svn works in a bare repository' '
	322	mkdir bare-repo &&
	323	( cd bare-repo &&
	324	git init --bare &&
	325	GIT_DIR=. git svn init "$svnrepo" &&
	326	git svn fetch ) &&
	327	rm -rf bare-repo
	328	'
bc93ceb7 BW	329	test_expect_success 'git-svn works in in a repository with a gitdir: link' '
	330	mkdir worktree gitdir &&
	331	( cd worktree &&
	332	git svn init "$svnrepo" &&
	333	git init --separate-git-dir ../gitdir &&
	334	git svn fetch ) &&
	335	rm -rf worktree gitdir
	336	'
6e5121f2	337
96a40b27	338	test_done