Merge branch 'maint'

diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index d7a704754ea13f17c098e56a7b068cb4f44c1fd0..1e31d6ea7253ee4216347fd707d1408f97af32fa 100755 (executable)
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Eric Wong
 #
 
-test_description='git-svn property tests'
+test_description='git svn property tests'
 . ./lib-git-svn.sh
 
 mkdir import
@@ -26,33 +26,33 @@ cd import
 EOF
 
        printf "Hello\r\nWorld\r\n" > crlf
-       a_crlf=`git-hash-object -w crlf`
+       a_crlf=`git hash-object -w crlf`
        printf "Hello\rWorld\r" > cr
-       a_cr=`git-hash-object -w cr`
+       a_cr=`git hash-object -w cr`
        printf "Hello\nWorld\n" > lf
-       a_lf=`git-hash-object -w lf`
+       a_lf=`git hash-object -w lf`
 
        printf "Hello\r\nWorld" > ne_crlf
-       a_ne_crlf=`git-hash-object -w ne_crlf`
+       a_ne_crlf=`git hash-object -w ne_crlf`
        printf "Hello\nWorld" > ne_lf
-       a_ne_lf=`git-hash-object -w ne_lf`
+       a_ne_lf=`git hash-object -w ne_lf`
        printf "Hello\rWorld" > ne_cr
-       a_ne_cr=`git-hash-object -w ne_cr`
+       a_ne_cr=`git hash-object -w ne_cr`
 
        touch empty
-       a_empty=`git-hash-object -w empty`
+       a_empty=`git hash-object -w empty`
        printf "\n" > empty_lf
-       a_empty_lf=`git-hash-object -w empty_lf`
+       a_empty_lf=`git hash-object -w empty_lf`
        printf "\r" > empty_cr
-       a_empty_cr=`git-hash-object -w empty_cr`
+       a_empty_cr=`git hash-object -w empty_cr`
        printf "\r\n" > empty_crlf
-       a_empty_crlf=`git-hash-object -w empty_crlf`
+       a_empty_crlf=`git hash-object -w empty_crlf`
 
-       svn import --no-auto-props -m 'import for git-svn' . "$svnrepo" >/dev/null
+       svn import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null
 cd ..
 
 rm -rf import
-test_expect_success 'checkout working copy from svn' "svn co $svnrepo test_wc"
+test_expect_success 'checkout working copy from svn' 'svn co "$svnrepo" test_wc'
 test_expect_success 'setup some commits to svn' \
        'cd test_wc &&
                echo Greetings >> kw.c &&
@@ -66,16 +66,16 @@ test_expect_success 'setup some commits to svn' \
                svn commit -m "Propset Id" &&
        cd ..'
 
-test_expect_success 'initialize git-svn' "git-svn init $svnrepo"
-test_expect_success 'fetch revisions from svn' 'git-svn fetch'
+test_expect_success 'initialize git svn' 'git svn init "$svnrepo"'
+test_expect_success 'fetch revisions from svn' 'git svn fetch'
 
 name='test svn:keywords ignoring'
 test_expect_success "$name" \
-       'git checkout -b mybranch remotes/git-svn &&
+       'git checkout -b mybranch ${remotes_git_svn} &&
        echo Hi again >> kw.c &&
        git commit -a -m "test keywords ignoring" &&
-       git-svn set-tree remotes/git-svn..mybranch &&
-       git pull . remotes/git-svn'
+       git svn set-tree ${remotes_git_svn}..mybranch &&
+       git pull . ${remotes_git_svn}'
 
 expect='/* $Id$ */'
 got="`sed -ne 2p kw.c`"
@@ -90,9 +90,9 @@ test_expect_success "propset CR on crlf files" \
         cd ..'
 
 test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
-       "git-svn fetch &&
-        git pull . remotes/git-svn &&
-        svn co $svnrepo new_wc"
+       'git svn fetch &&
+        git pull . ${remotes_git_svn} &&
+        svn co "$svnrepo" new_wc'
 
 for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf
 do
@@ -103,8 +103,8 @@ done
 cd test_wc
        printf '$Id$\rHello\rWorld\r' > cr
        printf '$Id$\rHello\rWorld' > ne_cr
-       a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git-hash-object --stdin`
-       a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git-hash-object --stdin`
+       a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin`
+       a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git hash-object --stdin`
        test_expect_success 'Set CRLF on cr files' \
        'svn propset svn:eol-style CRLF cr &&
         svn propset svn:eol-style CRLF ne_cr &&
@@ -113,10 +113,10 @@ cd test_wc
         svn commit -m "propset CRLF on cr files"'
 cd ..
 test_expect_success 'fetch and pull latest from svn' \
-       'git-svn fetch && git pull . remotes/git-svn'
+       'git svn fetch && git pull . ${remotes_git_svn}'
 
-b_cr="`git-hash-object cr`"
-b_ne_cr="`git-hash-object ne_cr`"
+b_cr="`git hash-object cr`"
+b_ne_cr="`git hash-object ne_cr`"
 
 test_expect_success 'CRLF + $Id$' "test '$a_cr' = '$b_cr'"
 test_expect_success 'CRLF + $Id$ (no newline)' "test '$a_ne_cr' = '$b_ne_cr'"
@@ -145,7 +145,7 @@ test_expect_success 'test show-ignore' "
        svn propset -R svn:ignore 'no-such-file*' .
        svn commit -m 'propset svn:ignore'
        cd .. &&
-       git-svn show-ignore > show-ignore.got &&
+       git svn show-ignore > show-ignore.got &&
        cmp show-ignore.expect show-ignore.got
        "
 
@@ -161,8 +161,8 @@ cat >create-ignore-index.expect <<\EOF
 EOF
 
 test_expect_success 'test create-ignore' "
-       git-svn fetch && git pull . remotes/git-svn &&
-       git-svn create-ignore &&
+       git svn fetch && git pull . ${remotes_git_svn} &&
+       git svn create-ignore &&
        cmp ./.gitignore create-ignore.expect &&
        cmp ./deeply/.gitignore create-ignore.expect &&
        cmp ./deeply/nested/.gitignore create-ignore.expect &&
@@ -182,15 +182,15 @@ EOF
 # pattern, it can pass even though the propget did not execute on the
 # right directory.
 test_expect_success 'test propget' "
-       git-svn propget svn:ignore . | cmp - prop.expect &&
+       git svn propget svn:ignore . | cmp - prop.expect &&
        cd deeply &&
-       git-svn propget svn:ignore . | cmp - ../prop.expect &&
-       git-svn propget svn:entry:committed-rev nested/directory/.keep \
+       git svn propget svn:ignore . | cmp - ../prop.expect &&
+       git svn propget svn:entry:committed-rev nested/directory/.keep \
          | cmp - ../prop2.expect &&
-       git-svn propget svn:ignore .. | cmp - ../prop.expect &&
-       git-svn propget svn:ignore nested/ | cmp - ../prop.expect &&
-       git-svn propget svn:ignore ./nested | cmp - ../prop.expect &&
-       git-svn propget svn:ignore .././deeply/nested | cmp - ../prop.expect
+       git svn propget svn:ignore .. | cmp - ../prop.expect &&
+       git svn propget svn:ignore nested/ | cmp - ../prop.expect &&
+       git svn propget svn:ignore ./nested | cmp - ../prop.expect &&
+       git svn propget svn:ignore .././deeply/nested | cmp - ../prop.expect
        "
 
 cat >prop.expect <<\EOF
@@ -210,8 +210,8 @@ Properties on 'nested/directory/.keep':
 EOF
 
 test_expect_success 'test proplist' "
-       git-svn proplist . | cmp - prop.expect &&
-       git-svn proplist nested/directory/.keep | cmp - prop2.expect
+       git svn proplist . | cmp - prop.expect &&
+       git svn proplist nested/directory/.keep | cmp - prop2.expect
        "
 
 test_done