Fix a minor problem in identifying squashes vs. normal splits.

[git.git] / test.sh

diff --git a/test.sh b/test.sh
index 4229f840ac1e25669fb40825f0508766d285c716..12b04565747cb995fb91c2dec8709690b367523c 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -78,10 +78,11 @@ git init
 create main4
 git commit -m 'main4'
 git branch -m master mainline
+git branch subdir
 
 git fetch ../subproj sub1
 git branch sub1 FETCH_HEAD
-git subtree add --prefix=subdir FETCH_HEAD
+git subtree add --prefix=subdir/ FETCH_HEAD
 
 # this shouldn't actually do anything, since FETCH_HEAD is already a parent
 git merge -m 'merge -s -ours' -s ours FETCH_HEAD
@@ -117,7 +118,7 @@ create sub9
 git commit -m 'sub9'
 
 cd ../mainline
-split2=$(git subtree split --annotate='*' --prefix subdir --rejoin)
+split2=$(git subtree split --annotate='*' --prefix subdir/ --rejoin)
 git branch split2 "$split2"
 
 create subdir/main-sub10
@@ -160,7 +161,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)" ""