changed alias for --prefix from -p to -P

diff --git a/test.sh b/test.sh
index 4f2b674e5de6e4b9c8c4ab9fd9684d99aa1cae50..12b04565747cb995fb91c2dec8709690b367523c 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -24,8 +24,8 @@ check()
 check_equal()
 {
        echo
-       echo "check a:" "$1"
-       echo "      b:" "$2"
+       echo "check a:" "{$1}"
+       echo "      b:" "{$2}"
        if [ "$1" = "$2" ]; then
                return 0
        else
@@ -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
@@ -100,36 +101,37 @@ git branch sub2 FETCH_HEAD
 git subtree merge --prefix=subdir FETCH_HEAD
 git branch pre-split
 
-split1=$(git subtree split --annotate='*' --prefix subdir --onto FETCH_HEAD --rejoin)
-echo "split1={$split1}"
-git branch split1 "$split1"
+spl1=$(git subtree split --annotate='*' \
+               --prefix subdir --onto FETCH_HEAD --rejoin)
+echo "spl1={$spl1}"
+git branch spl1 "$spl1"
 
 create subdir/main-sub8
 git commit -m 'main-sub8'
 
 cd ../subproj
-git fetch ../mainline split1
-git branch split1 FETCH_HEAD
+git fetch ../mainline spl1
+git branch spl1 FETCH_HEAD
 git merge FETCH_HEAD
 
 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
 git commit -m 'main-sub10'
 
-split3=$(git subtree split --annotate='*' --prefix subdir --rejoin)
-git branch split3 "$split3"
+spl3=$(git subtree split --annotate='*' --prefix subdir --rejoin)
+git branch spl3 "$spl3"
 
 cd ../subproj
-git fetch ../mainline split3
-git branch split3 FETCH_HEAD
+git fetch ../mainline spl3
+git branch spl3 FETCH_HEAD
 git merge FETCH_HEAD
-git branch subproj-merge-split3
+git branch subproj-merge-spl3
 
 chkm="main4 main6"
 chkms="main-sub10 main-sub5 main-sub7 main-sub8"
@@ -146,9 +148,9 @@ allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
 check_equal "$allchanges" "$chkms $chks"
 
 cd ../mainline
-git fetch ../subproj subproj-merge-split3
-git branch subproj-merge-split3 FETCH_HEAD
-git subtree pull --prefix=subdir ../subproj subproj-merge-split3
+git fetch ../subproj subproj-merge-spl3
+git branch subproj-merge-spl3 FETCH_HEAD
+git subtree pull --prefix=subdir ../subproj subproj-merge-spl3
 
 # make sure exactly the right set of files ends up in the mainline
 mainfiles=$(git ls-files | fixnl)
@@ -159,5 +161,47 @@ 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" "$chkm $chkms $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)" ""
+
+# make sure no 'git subtree' tagged commits make it into subproj. (They're
+# meaningless to subproj since one side of the merge refers to the mainline)
+check_equal "$(git log --pretty=format:'%s%n%b' HEAD^2 | grep 'git-subtree.*:')" ""
+
+# make sure no patch changes more than one file.  The original set of commits
+# changed only one file each.  A multi-file change would imply that we pruned
+# commits too aggressively.
+joincommits()
+{
+       commit=
+       all=
+       while read x y; do
+               echo "{$x}" >&2
+               if [ -z "$x" ]; then
+                       continue
+               elif [ "$x" = "commit:" ]; then
+                       if [ -n "$commit" ]; then
+                               echo "$commit $all"
+                               all=
+                       fi
+                       commit="$y"
+               else
+                       all="$all $y"
+               fi
+       done
+       echo "$commit $all"
+}
+x=
+git log --pretty=format:'commit: %H' | joincommits |
+(      while read commit a b; do
+               echo "Verifying commit $commit"
+               check_equal "$b" ""
+               x=1
+       done
+       check_equal "$x" 1
+) || exit 1
+
+echo
+echo 'ok'