diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-03-15 10:32:20 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-03-15 10:32:20 -0700 |
commit | a7206ba7f35f0ff4dd800baf57eeaced8deddd23 (patch) | |
tree | 133cd417cde6bda83fd43e5c5272b3f8d40baed8 /t/t9109-git-svn-multi-glob.sh | |
parent | Merge tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-po (diff) | |
parent | git-svn: shorten glob error message (diff) | |
download | tgif-a7206ba7f35f0ff4dd800baf57eeaced8deddd23.tar.xz |
Merge branch 'svn-glob' of git://bogomips.org/git-svn
* 'svn-glob' of git://bogomips.org/git-svn:
git-svn: shorten glob error message
git-svn: loosen config globs limitations
Diffstat (limited to 't/t9109-git-svn-multi-glob.sh')
-rwxr-xr-x | t/t9109-git-svn-multi-glob.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/t/t9109-git-svn-multi-glob.sh b/t/t9109-git-svn-multi-glob.sh index f36b749242..8d99e848d4 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" && |