Re: Mini bug report origin/pu: t1512 failed on Mac OS X (commit 957d74062c1f0e ?)

Junio C Hamano [off-list ref] writes:

I think the other tests in t/ prefer to unquote it so that we would
ignore spaces around "wc -l" output, i.e.

	test $(wc -l <actual) = 16

Thanks for a report.

-- >8 --
Subject: [PATCH] t1512: ignore whitespaces in wc -l output

Some implementations of sed (e.g. MacOS X) have whitespaces in the
output of "wc -l" that reads from the standard input.  Ignore these
whitespaces by not quoting the command substitution to be compared
with the constant "16".

Signed-off-by: Junio C Hamano <redacted>
---
 t/t1512-rev-parse-disambiguation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 3ed7558..1eb3514 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh

@@ -257,7 +257,7 @@ test_expect_success 'rev-parse --disambiguate' '
 	# commits created by commit-tree in earlier tests do not share
 	# the prefix.
 	git rev-parse --disambiguate=000000000 >actual &&
-	test "$(wc -l <actual)" = 16 &&
+	test $(wc -l <actual) = 16 &&
 	test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
 '
 

-- 
1.7.11.2.270.gc2d3e4b

Am 7/12/2012 1:30, schrieb Junio C Hamano:

-	test "$(wc -l <actual)" = 16 &&
+	test $(wc -l <actual) = 16 &&

We have a helper function for this:

	test_line_count = 16 actual &&

-- Hannes

On 07/12/2012 01:30 AM, Junio C Hamano wrote:

Junio C Hamano [off-list ref] writes:

quoted

I think the other tests in t/ prefer to unquote it so that we would
ignore spaces around "wc -l" output, i.e.

	test $(wc -l <actual) = 16

Thanks for a report.

-- >8 --
Subject: [PATCH] t1512: ignore whitespaces in wc -l output

Some implementations of sed (e.g. MacOS X)

'sed'?  Shouldn't this read 'wc'?

have whitespaces in the output of "wc -l" that reads from the standard
input.

FYI, the extra space is present with Solaris wc as well:

$ wc -l </dev/null
       0

Regards,
  Stefano