[PATCH] Fix t7601-merge-pull-config.sh on AIX
- From
Miklos Vajna <vmiklos@frugalware.org>
- Date
- Jul 5, 2008, 00:32 UTC
- Message-ID
- <1215217920-8506-1-git-send-email-vmiklos@frugalware.org>
- In-Reply-To
- <20080705002634.GF4729@genesis.frugalware.org>
The test failed on AIX (and likely other OS, such as apparently OSX) where wc -l outputs whitespace.
Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> ---
Here is the same, with backticks avoided, and with a proper commit message.
t/t7601-merge-pull-config.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index 32585f8..12f71ad 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -70,10 +70,10 @@ test_expect_success 'merge c1 with c2 and c3 (recursive and octopus in pull.octo conflict_count() { - eval $1=`{ + eval $1=$({ git diff-files --name-only git ls-files --unmerged - } | wc -l` + } | wc -l | tr -d \ ) } # c4 - c5
-- 1.5.6.1