Merge branch 'maint'

diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 46fcec50a5271d80464d7f37e5d402b1a3c0b6d0..622ea1c0df1cdfcbabcd9a884abe151c4d0dff53 100755 (executable)
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -56,11 +56,14 @@ 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 &&
+               poke kw.c &&
                svn commit -m "Not yet an Id" &&
                echo Hello world >> kw.c &&
+               poke kw.c &&
                svn commit -m "Modified file, but still not yet an Id" &&
                svn propset svn:keywords Id kw.c &&
-               svn commit -m "Propset Id"
+               poke kw.c &&
+               svn commit -m "Propset Id" &&
        cd ..'
 
 test_expect_success 'initialize git-svn' "git-svn init $svnrepo"
@@ -70,7 +73,7 @@ name='test svn:keywords ignoring'
 test_expect_success "$name" \
        'git checkout -b mybranch remotes/git-svn &&
        echo Hi again >> kw.c &&
-       git commit -a -m "test keywoards ignoring" &&
+       git commit -a -m "test keywords ignoring" &&
        git-svn set-tree remotes/git-svn..mybranch &&
        git pull . remotes/git-svn'
 
@@ -83,7 +86,7 @@ test_expect_success "propset CR on crlf files" \
                svn propset svn:eol-style CR empty &&
                svn propset svn:eol-style CR crlf &&
                svn propset svn:eol-style CR ne_crlf &&
-               svn commit -m "propset CR on crlf files"
+               svn commit -m "propset CR on crlf files" &&
         cd ..'
 
 test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
@@ -118,4 +121,30 @@ 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'"
 
+cat > show-ignore.expect <<\EOF
+
+# /
+/no-such-file*
+
+# deeply
+/deeply/no-such-file*
+
+# deeply/nested
+/deeply/nested/no-such-file*
+
+# deeply/nested/directory
+/deeply/nested/directory/no-such-file*
+EOF
+
+test_expect_success 'test show-ignore' "
+       cd test_wc &&
+       mkdir -p deeply/nested/directory &&
+       svn add deeply &&
+       svn propset -R svn:ignore 'no-such-file*' .
+       svn commit -m 'propset svn:ignore'
+       cd .. &&
+       git-svn show-ignore > show-ignore.got &&
+       cmp show-ignore.expect show-ignore.got
+       "
+
 test_done