kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Miklos Vajna 2008-07-05 16:23:58 +02:00 committed by Junio C Hamano
parent 7b9c0a69a5
commit 1c6669351a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/t7601-merge-pull-config.sh
View File

@ -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 diff-files --name-only
git ls-files --unmerged 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 config pull.twohead "recursive resolve" &&
git reset --hard c5 && git reset --hard c5 &&
git merge -s resolve c6 git merge -s resolve c6
conflict_count resolve_count && resolve_count=$(conflict_count) &&
git reset --hard c5 && git reset --hard c5 &&
git merge -s recursive c6 git merge -s recursive c6
conflict_count recursive_count && recursive_count=$(conflict_count) &&
git reset --hard c5 && git reset --hard c5 &&
git merge c6 git merge c6
conflict_count auto_count && auto_count=$(conflict_count) &&
test "$auto_count" = "$recursive_count" && test $auto_count = $recursive_count &&
test "$auto_count" != "$resolve_count" test $auto_count != $resolve_count
' '


test_done test_done