git-svn: fix committing to subdirectories, add tests
I broke this part with the URL minimization; since git-svn will now try to connect to the root of the repository and will end up writing files there if it can... Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
@ -236,4 +236,33 @@ test_expect_success \
|
||||
'^:refs/remotes/git-svn$'
|
||||
"
|
||||
|
||||
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 '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_done
|
||||
|
||||
Reference in New Issue
Block a user