[PATCH] t5701: "wc -l" may add whitespace

[PATCH] t5701: "wc -l" may add whitespace

[Johannes Schindelin]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

	Found in msysGit... MSys' wc seems to suffer the same defect that 
	OSX' wc has...

 t/t5701-clone-local.sh |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh
index d2f55eb..7e7019f 100755
--- a/t/t5701-clone-local.sh
+++ b/t/t5701-clone-local.sh
@@ -54,8 +54,7 @@ test_expect_success 'With -no-hardlinks, local will make a copy' '
 	cd "$D" &&
 	git clone --bare --no-hardlinks x w &&
 	cd w &&
-	linked=$(find objects -type f ! -links 1 | wc -l) &&
-	test "$linked" = 0
+	test $(find objects -type f ! -links 1 | wc -l) = 0
 '
 
 test_expect_success 'Even without -l, local will make a hardlink' '
@@ -63,8 +62,7 @@ test_expect_success 'Even without -l, local will make a hardlink' '
 	rm -fr w &&
 	git clone -l --bare x w &&
 	cd w &&
-	copied=$(find objects -type f -links 1 | wc -l) &&
-	test "$copied" = 0
+	test $(find objects -type f -links 1 | wc -l) = 0
 '
 
 test_done
-- 
1.5.3.rc7.2.g2d7f

Re: [PATCH] t5701: "wc -l" may add whitespace

[Matthieu Moy]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> -	linked=$(find objects -type f ! -links 1 | wc -l) &&
> -	test "$linked" = 0
> +	test $(find objects -type f ! -links 1 | wc -l) = 0

You can also use "test x -eq y" to compare integers.

I don't know which one is the most portable.

-- 
Matthieu

Re: [PATCH] t5701: "wc -l" may add whitespace

[Johannes Schindelin]

Hi,

On Wed, 29 Aug 2007, Matthieu Moy wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > -	linked=$(find objects -type f ! -links 1 | wc -l) &&
> > -	test "$linked" = 0
> > +	test $(find objects -type f ! -links 1 | wc -l) = 0
> 
> You can also use "test x -eq y" to compare integers.
> 
> I don't know which one is the most portable.

Who cares when my version is obviously portable?

Ciao,
Dscho

Re: [PATCH] t5701: "wc -l" may add whitespace

[Junio C Hamano]

Isn't this already in as 70f64148bf7ca5136f2aa18c41b3b8f4bebfd138
(Fix t5701-clone-local for white space from wc)?

Re: [PATCH] t5701: "wc -l" may add whitespace

[Johannes Schindelin]

Hi,

On Wed, 29 Aug 2007, Junio C Hamano wrote:

> Isn't this already in as 70f64148bf7ca5136f2aa18c41b3b8f4bebfd138
> (Fix t5701-clone-local for white space from wc)?

Argh.  I get confused with those new-workdirs.  (And it was necessary 
for 4msysgit, which lags behind again...)  Sorry for the noise.

Ciao,
Dscho