diff options
| author | Eric Wong <normalperson@yhbt.net> | 2016-01-14 03:59:48 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2016-03-15 01:35:39 +0000 |
| commit | 62335bbbc747c96636b5ce9917b156304c732eaf (patch) | |
| tree | 8c1661a75eabad5898349b6f3301cff3e37a724d /t | |
| parent | e4e5dd94e6eea4b50d8baed8b6b8cc50f6c8eae4 (diff) | |
| download | git-62335bbbc747c96636b5ce9917b156304c732eaf.tar.gz git-62335bbbc747c96636b5ce9917b156304c732eaf.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9108-git-svn-glob.sh | 9 | ||||
| -rwxr-xr-x | t/t9109-git-svn-multi-glob.sh | 9 | ||||
| -rwxr-xr-x | t/t9168-git-svn-partially-globbed-names.sh | 7 |
3 files changed, 16 insertions, 9 deletions
diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh index a526d6037..a94286c8e 100755 --- 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 f36b74924..8d99e848d 100755 --- 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 a7641dc1e..8b22f2272 100755 --- 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' ' |