diff options
Diffstat (limited to 't/t9115-git-svn-dcommit-funky-renames.sh')
| -rwxr-xr-x | t/t9115-git-svn-dcommit-funky-renames.sh | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh index 182299cbb5..4acbcb0acd 100755 --- a/t/t9115-git-svn-dcommit-funky-renames.sh +++ b/t/t9115-git-svn-dcommit-funky-renames.sh @@ -9,7 +9,7 @@ test_description='git-svn dcommit can commit renames of files with ugly names' test_expect_success 'load repository with strange names' " svnadmin load -q $rawsvnrepo < ../t9115/funky-names.dump && - start_httpd + start_httpd gtk+ " test_expect_success 'init and fetch repository' " @@ -49,6 +49,39 @@ test_expect_success 'rename pretty file into ugly one' ' git svn dcommit ' +test_expect_success 'add a file with plus signs' ' + echo .. > +_+ && + git update-index --add +_+ && + git commit -m plus && + mkdir gtk+ && + git mv +_+ gtk+/_+_ && + git commit -m plus_dir && + git svn dcommit + ' + +test_expect_success 'clone the repository to test rebase' " + git svn clone $svnrepo test-rebase && + cd test-rebase && + echo test-rebase > test-rebase && + git add test-rebase && + git commit -m test-rebase && + cd .. + " + +test_expect_success 'make a commit to test rebase' " + echo test-rebase-main > test-rebase-main && + git add test-rebase-main && + git commit -m test-rebase-main && + git svn dcommit + " + +test_expect_success 'git-svn rebase works inside a fresh-cloned repository' " + cd test-rebase && + git svn rebase && + test -e test-rebase-main && + test -e test-rebase + " + stop_httpd test_done |