Add explicit path of git installation by 'git --exec-path'.

diff --git a/test.sh b/test.sh
index 276f40d1daffe3157baa886232510a154d32678c..8283fadaad669bdf4ead0d988abc0f97e0edc1c2 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 . shellopts.sh
 set -e
 
@@ -8,6 +8,50 @@ create()
        git add "$1"
 }
 
+check()
+{
+       echo
+       echo "check:" "$@"
+       if "$@"; then
+               echo ok
+               return 0
+       else
+               echo FAILED
+               exit 1
+       fi
+}
+
+check_equal()
+{
+       echo
+       echo "check a:" "{$1}"
+       echo "      b:" "{$2}"
+       if [ "$1" = "$2" ]; then
+               return 0
+       else
+               echo FAILED
+               exit 1
+       fi
+}
+
+fixnl()
+{      
+       t=""
+       while read x; do
+               t="$t$x "
+       done
+       echo $t
+}
+
+multiline()
+{
+       while read x; do
+               set -- $x
+               for d in "$@"; do
+                       echo "$d"
+               done
+       done
+}
 
 rm -rf mainline subproj
 mkdir mainline subproj
@@ -19,6 +63,7 @@ create sub1
 git commit -m 'sub1'
 git branch sub1
 git branch -m master subproj
+check true
 
 create sub2
 git commit -m 'sub2'
@@ -55,16 +100,17 @@ 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
@@ -77,16 +123,84 @@ 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"
+chkms_sub=$(echo $chkms | multiline | sed 's,^,subdir/,' | fixnl)
+chks="sub1 sub2 sub3 sub9"
+chks_sub=$(echo $chks | multiline | sed 's,^,subdir/,' | fixnl)
+
+# make sure exactly the right set of files ends up in the subproj
+subfiles=$(git ls-files | fixnl)
+check_equal "$subfiles" "$chkms $chks"
+
+# make sure the subproj history *only* contains commits that affect the subdir.
+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)
+check_equal "$mainfiles" "$chkm $chkms_sub $chks_sub"
+
+# make sure each filename changed exactly once in the entire history.
+# 'main-sub??' and '/subdir/main-sub??' both change, because those are the
+# 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" "$(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'