Merge branch 'maint'

diff --git a/t/t9119-git-svn-info.sh b/t/t9119-git-svn-info.sh
index cc619115931cb74a85a171ade915ca2c47639c9b..5fd36a148304e4532f4e1b30deac781028c68271 100755 (executable)
--- a/t/t9119-git-svn-info.sh
+++ b/t/t9119-git-svn-info.sh
@@ -5,20 +5,38 @@
 test_description='git-svn info'
 
 . ./lib-git-svn.sh
-say 'skipping svn-info test (has a race undiagnosed yet)'
-test_done
+
+set -e
+
+# Tested with: svn, version 1.4.4 (r25188)
+v=`svn --version | sed -n -e 's/^svn, version \(1\.4\.[0-9]\).*$/\1/p'`
+case $v in
+1.4.*)
+       ;;
+*)
+       say "skipping svn-info test (SVN version: $v not supported)"
+       test_done
+       ;;
+esac
 
 ptouch() {
        perl -w -e '
                use strict;
+               use POSIX qw(mktime);
                die "ptouch requires exactly 2 arguments" if @ARGV != 2;
-               die "$ARGV[0] does not exist" if ! -e $ARGV[0];
-               my @s = stat $ARGV[0];
-               utime $s[8], $s[9], $ARGV[1];
-       ' "$1" "$2"
+               my $text_last_updated = shift @ARGV;
+               my $git_file = shift @ARGV;
+               die "\"$git_file\" does not exist" if ! -e $git_file;
+               if ($text_last_updated
+                   =~ /(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})/) {
+                       my $mtime = mktime($6, $5, $4, $3, $2 - 1, $1 - 1900);
+                       my $atime = $mtime;
+                       utime $atime, $mtime, $git_file;
+               }
+       ' "`svn info $2 | grep '^Text Last Updated:'`" "$1"
 }
 
-test_expect_success 'setup repository and import' "
+test_expect_success 'setup repository and import' '
        mkdir info &&
        cd info &&
                echo FIRST > A &&
@@ -27,19 +45,19 @@ test_expect_success 'setup repository and import' "
                mkdir directory &&
                touch directory/.placeholder &&
                ln -s directory symlink-directory &&
-               svn import -m 'initial' . $svnrepo &&
+               svn import -m "initial" . "$svnrepo" &&
        cd .. &&
        mkdir gitwc &&
        cd gitwc &&
-               git-svn init $svnrepo &&
+               git-svn init "$svnrepo" &&
                git-svn fetch &&
        cd .. &&
-       svn co $svnrepo svnwc &&
+       svn co "$svnrepo" svnwc &&
        ptouch svnwc/file gitwc/file &&
        ptouch svnwc/directory gitwc/directory &&
        ptouch svnwc/symlink-file gitwc/symlink-file &&
        ptouch svnwc/symlink-directory gitwc/symlink-directory
-       "
+       '
 
 test_expect_success 'info' "
        (cd svnwc; svn info) > expected.info &&
@@ -48,7 +66,7 @@ test_expect_success 'info' "
        "
 
 test_expect_success 'info --url' '
-       test $(cd gitwc; git-svn info --url) = $svnrepo
+       test "$(cd gitwc; git-svn info --url)" = "$svnrepo"
        '
 
 test_expect_success 'info .' "
@@ -58,7 +76,7 @@ test_expect_success 'info .' "
        "
 
 test_expect_success 'info --url .' '
-       test $(cd gitwc; git-svn info --url .) = $svnrepo
+       test "$(cd gitwc; git-svn info --url .)" = "$svnrepo"
        '
 
 test_expect_success 'info file' "
@@ -68,7 +86,7 @@ test_expect_success 'info file' "
        "
 
 test_expect_success 'info --url file' '
-       test $(cd gitwc; git-svn info --url file) = "$svnrepo/file"
+       test "$(cd gitwc; git-svn info --url file)" = "$svnrepo/file"
        '
 
 test_expect_success 'info directory' "
@@ -78,7 +96,7 @@ test_expect_success 'info directory' "
        "
 
 test_expect_success 'info --url directory' '
-       test $(cd gitwc; git-svn info --url directory) = "$svnrepo/directory"
+       test "$(cd gitwc; git-svn info --url directory)" = "$svnrepo/directory"
        '
 
 test_expect_success 'info symlink-file' "
@@ -88,7 +106,7 @@ test_expect_success 'info symlink-file' "
        "
 
 test_expect_success 'info --url symlink-file' '
-       test $(cd gitwc; git-svn info --url symlink-file) \
+       test "$(cd gitwc; git-svn info --url symlink-file)" \
             = "$svnrepo/symlink-file"
        '
 
@@ -101,7 +119,7 @@ test_expect_success 'info symlink-directory' "
        "
 
 test_expect_success 'info --url symlink-directory' '
-       test $(cd gitwc; git-svn info --url symlink-directory) \
+       test "$(cd gitwc; git-svn info --url symlink-directory)" \
             = "$svnrepo/symlink-directory"
        '
 
@@ -121,7 +139,7 @@ test_expect_success 'info added-file' "
        "
 
 test_expect_success 'info --url added-file' '
-       test $(cd gitwc; git-svn info --url added-file) \
+       test "$(cd gitwc; git-svn info --url added-file)" \
             = "$svnrepo/added-file"
        '
 
@@ -143,7 +161,7 @@ test_expect_success 'info added-directory' "
        "
 
 test_expect_success 'info --url added-directory' '
-       test $(cd gitwc; git-svn info --url added-directory) \
+       test "$(cd gitwc; git-svn info --url added-directory)" \
             = "$svnrepo/added-directory"
        '
 
@@ -166,7 +184,7 @@ test_expect_success 'info added-symlink-file' "
        "
 
 test_expect_success 'info --url added-symlink-file' '
-       test $(cd gitwc; git-svn info --url added-symlink-file) \
+       test "$(cd gitwc; git-svn info --url added-symlink-file)" \
             = "$svnrepo/added-symlink-file"
        '
 
@@ -189,7 +207,7 @@ test_expect_success 'info added-symlink-directory' "
        "
 
 test_expect_success 'info --url added-symlink-directory' '
-       test $(cd gitwc; git-svn info --url added-symlink-directory) \
+       test "$(cd gitwc; git-svn info --url added-symlink-directory)" \
             = "$svnrepo/added-symlink-directory"
        '
 
@@ -215,7 +233,7 @@ test_expect_success 'info deleted-file' "
        "
 
 test_expect_success 'info --url file (deleted)' '
-       test $(cd gitwc; git-svn info --url file) \
+       test "$(cd gitwc; git-svn info --url file)" \
             = "$svnrepo/file"
        '
 
@@ -236,7 +254,7 @@ test_expect_success 'info deleted-directory' "
        "
 
 test_expect_success 'info --url directory (deleted)' '
-       test $(cd gitwc; git-svn info --url directory) \
+       test "$(cd gitwc; git-svn info --url directory)" \
             = "$svnrepo/directory"
        '
 
@@ -258,7 +276,7 @@ test_expect_success 'info deleted-symlink-file' "
        "
 
 test_expect_success 'info --url symlink-file (deleted)' '
-       test $(cd gitwc; git-svn info --url symlink-file) \
+       test "$(cd gitwc; git-svn info --url symlink-file)" \
             = "$svnrepo/symlink-file"
        '
 
@@ -280,7 +298,7 @@ test_expect_success 'info deleted-symlink-directory' "
        "
 
 test_expect_success 'info --url symlink-directory (deleted)' '
-       test $(cd gitwc; git-svn info --url symlink-directory) \
+       test "$(cd gitwc; git-svn info --url symlink-directory)" \
             = "$svnrepo/symlink-directory"
        '
 
@@ -297,8 +315,8 @@ test_expect_success 'info unknown-file' "
        "
 
 test_expect_success 'info --url unknown-file' '
-       test -z $(cd gitwc; git-svn info --url unknown-file \
-                       2> ../actual.info--url-unknown-file) &&
+       test -z "$(cd gitwc; git-svn info --url unknown-file \
+                       2> ../actual.info--url-unknown-file)" &&
        git-diff expected.info-unknown-file actual.info--url-unknown-file
        '
 
@@ -314,8 +332,8 @@ test_expect_success 'info unknown-directory' "
        "
 
 test_expect_success 'info --url unknown-directory' '
-       test -z $(cd gitwc; git-svn info --url unknown-directory \
-                       2> ../actual.info--url-unknown-directory) &&
+       test -z "$(cd gitwc; git-svn info --url unknown-directory \
+                       2> ../actual.info--url-unknown-directory)" &&
        git-diff expected.info-unknown-directory \
                 actual.info--url-unknown-directory
        '
@@ -337,8 +355,8 @@ test_expect_success 'info unknown-symlink-file' "
        "
 
 test_expect_success 'info --url unknown-symlink-file' '
-       test -z $(cd gitwc; git-svn info --url unknown-symlink-file \
-                       2> ../actual.info--url-unknown-symlink-file) &&
+       test -z "$(cd gitwc; git-svn info --url unknown-symlink-file \
+                       2> ../actual.info--url-unknown-symlink-file)" &&
        git-diff expected.info-unknown-symlink-file \
                 actual.info--url-unknown-symlink-file
        '
@@ -361,8 +379,8 @@ test_expect_success 'info unknown-symlink-directory' "
        "
 
 test_expect_success 'info --url unknown-symlink-directory' '
-       test -z $(cd gitwc; git-svn info --url unknown-symlink-directory \
-                       2> ../actual.info--url-unknown-symlink-directory) &&
+       test -z "$(cd gitwc; git-svn info --url unknown-symlink-directory \
+                       2> ../actual.info--url-unknown-symlink-directory)" &&
        git-diff expected.info-unknown-symlink-directory \
                 actual.info--url-unknown-symlink-directory
        '