git-svn: shorten glob error message

Error messages should attempt to fit within the confines of
an 80-column terminal to avoid compatibility and accessibility
problems.  Furthermore the word "directories" can be misleading
when used in the context of git refnames.

Signed-off-by: Eric Wong <normalperson@yhbt.net>

diff --git a/perl/Git/SVN/GlobSpec.pm b/perl/Git/SVN/GlobSpec.pm
index 4775026c5de639d37a40ff941971915871314c66..a0a8d1762150acd5b6a91116d4835fba1834d425 100644 (file)
--- a/perl/Git/SVN/GlobSpec.pm
+++ b/perl/Git/SVN/GlobSpec.pm
@@ -8,8 +8,8 @@ sub new {
        $re =~ s!/+$!!g; # no need for trailing slashes
        my (@left, @right, @patterns);
        my $state = "left";
-       my $die_msg = "Only one set of wildcard directories " .
-                               "(e.g. '*' or '*/*/*') is supported: '$glob'\n";
+       my $die_msg = "Only one set of wildcards " .
+                               "(e.g. '*' or '*/*/*') is supported: $glob\n";
        for my $part (split(m|/|, $glob)) {
                if ($pattern_ok && $part =~ /[{}]/ &&
                         $part !~ /^\{[^{}]+\}/) {

diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh
index a526d603793957f781002c98b2da60e1005bf39f..a94286c8ec89823805989f4363072417e9c20165 100755 (executable)
--- a/t/t9108-git-svn-glob.sh
+++ b/t/t9108-git-svn-glob.sh
@@ -86,9 +86,12 @@ test_expect_success 'test left-hand-side only globbing' '
        test_cmp expect.two output.two
        '
 
-echo "Only one set of wildcard directories" \
-     "(e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three
-echo "" >> expect.three
+test_expect_success 'prepare test disallow multi-globs' "
+cat >expect.three <<EOF
+Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
+
+EOF
+       "
 
 test_expect_success 'test disallow multi-globs' '
        git config --add svn-remote.three.url "$svnrepo" &&

diff --git a/t/t9109-git-svn-multi-glob.sh b/t/t9109-git-svn-multi-glob.sh
index f36b74924236ff54bc6400ff8afacdf95def363d..8d99e848d47634ea340885fde48bc798a2c0b7a2 100755 (executable)
--- a/t/t9109-git-svn-multi-glob.sh
+++ b/t/t9109-git-svn-multi-glob.sh
@@ -135,9 +135,12 @@ test_expect_success 'test another branch' '
        test_cmp expect.four output.four
        '
 
-echo "Only one set of wildcard directories" \
-     "(e.g. '*' or '*/*/*') is supported: 'branches/*/t/*'" > expect.three
-echo "" >> expect.three
+test_expect_success 'prepare test disallow multiple globs' "
+cat >expect.three <<EOF
+Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/*/t/*
+
+EOF
+       "
 
 test_expect_success 'test disallow multiple globs' '
        git config --add svn-remote.three.url "$svnrepo" &&

diff --git a/t/t9168-git-svn-partially-globbed-names.sh b/t/t9168-git-svn-partially-globbed-names.sh
index a7641dc1e903106ac944333031bc8baf63cd9aef..8b22f2272cca47cd9187accdaed3ce1f12b6c9e1 100755 (executable)
--- a/t/t9168-git-svn-partially-globbed-names.sh
+++ b/t/t9168-git-svn-partially-globbed-names.sh
@@ -130,9 +130,10 @@ test_expect_success 'test prefixed globs match just prefix' '
        '
 
 test_expect_success 'prepare test disallow prefixed multi-globs' "
-       echo \"Only one set of wildcard directories\" \
-            \"(e.g. '*' or '*/*/*') is supported: 'branches/b_*/t/*'\" >expect.four &&
-       echo \"\" >>expect.four
+cat >expect.four <<EOF
+Only one set of wildcards (e.g. '*' or '*/*/*') is supported: branches/b_*/t/*
+
+EOF
        "
 
 test_expect_success 'test disallow prefixed multi-globs' '