sort assertion to make it more generic
Amiel Martin committed
Aug 12, 2009 at 15:38 UTC
558e7a57e20fe68aee05f74f8005b7a39795ac15
1 file changed
+1
-1
test.sh
+1
-1
@@ -160,7 +160,7 @@ check_equal "$mainfiles" "$chkm $chkms_sub $chks_sub"
160
# changes that were split into their own history. And 'subdir/sub??' never
161
# change, since they were *only* changed in the subtree branch.
162
allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
163
-check_equal "$allchanges" "$chkms $chkm $chks $chkms_sub"
163
+check_equal "$allchanges" "$(echo $chkms $chkm $chks $chkms_sub | multiline | sort | fixnl)"
164
165
# make sure the --rejoin commits never make it into subproj
166
check_equal "$(git log --pretty=format:'%s' HEAD^2 | grep -i split)" ""