From: Amiel Martin <amiel.martin@gmail.com>
Date: Wed, 12 Aug 2009 22:38:00 +0000 (-0700)
Subject: sort assertion to make it more generic
X-Git-Tag: v1.7.11-rc0~176^2~40
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=558e7a57e20fe68aee05f74f8005b7a39795ac15;p=git.git

sort assertion to make it more generic
---

diff --git a/test.sh b/test.sh
index 4229f840a..8283fadaa 100755
--- a/test.sh
+++ b/test.sh
@@ -160,7 +160,7 @@ check_equal "$mainfiles" "$chkm $chkms_sub $chks_sub"
 # changes that were split into their own history.  And 'subdir/sub??' never
 # change, since they were *only* changed in the subtree branch.
 allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
-check_equal "$allchanges" "$chkms $chkm $chks $chkms_sub"
+check_equal "$allchanges" "$(echo $chkms $chkm $chks $chkms_sub | multiline | sort | fixnl)"
 
 # make sure the --rejoin commits never make it into subproj
 check_equal "$(git log --pretty=format:'%s' HEAD^2 | grep -i split)" ""