Merge branch 'da/difftool-mergetool-simplify-reporting-status'

diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index 4acbcb0acdce7852ee1f416250b5939132a93ca1..6a48e4042996549e40843186783e2215beee9cca 100755 (executable)
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -3,23 +3,23 @@
 # Copyright (c) 2007 Eric Wong
 
 
-test_description='git-svn dcommit can commit renames of files with ugly names'
+test_description='git svn dcommit can commit renames of files with ugly names'
 
 . ./lib-git-svn.sh
 
-test_expect_success 'load repository with strange names' "
-       svnadmin load -q $rawsvnrepo < ../t9115/funky-names.dump &&
+test_expect_success 'load repository with strange names' '
+       svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9115/funky-names.dump &&
        start_httpd gtk+
-       "
+       '
 
-test_expect_success 'init and fetch repository' "
-       git svn init $svnrepo &&
+test_expect_success 'init and fetch repository' '
+       git svn init "$svnrepo" &&
        git svn fetch &&
        git reset --hard git-svn
-       "
+       '
 
 test_expect_success 'create file in existing ugly and empty dir' '
-       mkdir "#{bad_directory_name}" &&
+       mkdir -p "#{bad_directory_name}" &&
        echo hi > "#{bad_directory_name}/ foo" &&
        git update-index --add "#{bad_directory_name}/ foo" &&
        git commit -m "new file in ugly parent" &&
@@ -37,7 +37,7 @@ test_expect_success 'rename pretty file' '
        git update-index --add pretty &&
        git commit -m "pretty :x" &&
        git svn dcommit &&
-       mkdir regular_dir_name &&
+       mkdir -p regular_dir_name &&
        git mv pretty regular_dir_name/pretty &&
        git commit -m "moved pretty file" &&
        git svn dcommit
@@ -59,28 +59,29 @@ test_expect_success 'add a file with plus signs' '
        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 &&
+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 ..
-       "
+               git commit -m test-rebase
+       )
+       '
 
-test_expect_success 'make a commit to test rebase' "
+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' "
+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