Fix t7601-merge-pull-config.sh on AIX

The test failed on AIX (and likely other OS, such as apparently OSX)
where wc -l outputs whitespace.

Also, avoid unnecessary eval in conflict_count().

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 32585f8e0dcedc6800d198910f0d13c7c6101c67..95b4d71c5154a62bc2e483eecccada0079bf05f4 100755 (executable)
--- 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()
 {
 
 conflict_count()
 {

-       eval $1=`{
+       {

                git diff-files --name-only
                git ls-files --unmerged
                git diff-files --name-only
                git ls-files --unmerged

-       } | wc -l`
+       } | wc -l

 }
 
 # c4 - c5
 }
 
 # c4 - c5


@@ -115,15 +115,15 @@ test_expect_success 'merge picks up the best result' '
        git config pull.twohead "recursive resolve" &&
        git reset --hard c5 &&
        git merge -s resolve c6
        git config pull.twohead "recursive resolve" &&
        git reset --hard c5 &&
        git merge -s resolve c6

-       conflict_count resolve_count &&
+       resolve_count=$(conflict_count) &&

        git reset --hard c5 &&
        git merge -s recursive c6
        git reset --hard c5 &&
        git merge -s recursive c6

-       conflict_count recursive_count &&
+       recursive_count=$(conflict_count) &&

        git reset --hard c5 &&
        git merge c6
        git reset --hard c5 &&
        git merge c6

-       conflict_count auto_count &&
-       test "$auto_count" = "$recursive_count" &&
-       test "$auto_count" != "$resolve_count"
+       auto_count=$(conflict_count) &&
+       test $auto_count = $recursive_count &&
+       test $auto_count != $resolve_count

 '
 
 test_done
 '
 
 test_done