t9107: switch inverted single/double quotes in test

peff · gitster · commit 9874576995c8 · 2016-05-14T10:37:29.000-07:00
One of the test snippets in t9107 is enclosed in double
quotes, but then uses single quotes to surround an
interpolated variable inside the snippet, like:

  test_expect_success '...' "
	test -n '$head'
  "

This happens to work because the variable is interpolated
_before_ the snippet is run, and the result is eval'd. So as
long as the variable does not contain any single quotes, the
two are equivalent. And it doesn't, as we know it is a sha1
from rev-parse above.  But this construct is unnecessarily
confusing.

But we can go a step further in cleaning up. The test is
really checking that a particular ref has a value. Rather
than checking if rev-parse produced output, we can just move
rev-parse into the test itself, and rely on the exit code
from --verify. Nobody else cares about the $head variable at
all.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
@@ -24,8 +24,9 @@ test_expect_success 'setup old-looking metadata' '
 	git update-ref -d refs/remotes/git-svn refs/remotes/git-svn
 	'
 
-head=$(git rev-parse --verify refs/heads/git-svn-HEAD^0)
-test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
+test_expect_success 'git-svn-HEAD is a real HEAD' '
+	git rev-parse --verify refs/heads/git-svn-HEAD^0
+'
 
 svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/')
 

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,9 @@ test_expect_success 'setup old-looking metadata' '`
`24`	`24`	`git update-ref -d refs/remotes/git-svn refs/remotes/git-svn`
`25`	`25`	`'`
`26`	`26`
`27`		`-head=$(git rev-parse --verify refs/heads/git-svn-HEAD^0)`
`28`		`-test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"`
	`27`	`+test_expect_success 'git-svn-HEAD is a real HEAD' '`
	`28`	`+ git rev-parse --verify refs/heads/git-svn-HEAD^0`
	`29`	`+'`
`29`	`30`
`30`	`31`	`svnrepo_escaped=$(echo $svnrepo \| sed 's/ /%20/')`
`31`	`32`