diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:35 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:35 -0700 |
commit | dca05bb5913026fb64f6392675e7ab3ff643dcec (patch) | |
tree | 153bb538cd060b49307af828cbc2315e9f7490de /t/t9153-git-svn-rewrite-uuid.sh | |
parent | 53c4b3ed0e4c43fcd95473733b61e560ee21b4bc (diff) | |
parent | 268ef4d3d07e4cf9909ac060b63b195509391190 (diff) | |
download | git-dca05bb5913026fb64f6392675e7ab3ff643dcec.tar.gz |
Merge branch 'jk/test-z-n-unquoted'
t9xxx series has been updated primarily for readability, while
fixing small bugs in it. A few scripted Porcelains have also been
updated to fix possible bugs around their use of "test -z" and
"test -n".
* jk/test-z-n-unquoted:
always quote shell arguments to test -z/-n
t9103: modernize test style
t9107: switch inverted single/double quotes in test
t9107: use "return 1" instead of "exit 1"
t9100,t3419: enclose all test code in single-quotes
t/lib-git-svn: drop $remote_git_svn and $git_svn_id
Diffstat (limited to 't/t9153-git-svn-rewrite-uuid.sh')
-rwxr-xr-x | t/t9153-git-svn-rewrite-uuid.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9153-git-svn-rewrite-uuid.sh b/t/t9153-git-svn-rewrite-uuid.sh index 88a2cfa233..372ef15685 100755 --- a/t/t9153-git-svn-rewrite-uuid.sh +++ b/t/t9153-git-svn-rewrite-uuid.sh @@ -17,9 +17,9 @@ test_expect_success 'load svn repo' " test_expect_success 'verify uuid' " git cat-file commit refs/remotes/git-svn~0 | \ - grep '^${git_svn_id}: .*@2 $uuid$' && + grep '^git-svn-id: .*@2 $uuid$' && git cat-file commit refs/remotes/git-svn~1 | \ - grep '^${git_svn_id}: .*@1 $uuid$' + grep '^git-svn-id: .*@1 $uuid$' " test_done |