-#!/bin/bash -x
+#!/bin/bash
. shellopts.sh
set -e
+create()
+{
+ echo "$1" >"$1"
+ 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
cd subproj
git init
-touch sub1
-git add sub1
-git commit -m 'sub-1'
+create sub1
+git commit -m 'sub1'
git branch sub1
git branch -m master subproj
+check true
-touch sub2
-git add sub2
-git commit -m 'sub-2'
+create sub2
+git commit -m 'sub2'
git branch sub2
-touch sub3
-git add sub3
-git commit -m 'sub-3'
+create sub3
+git commit -m 'sub3'
git branch sub3
cd ../mainline
git init
-touch main1
-git add main1
-git commit -m 'main-1'
+create main4
+git commit -m 'main4'
git branch -m master mainline
git fetch ../subproj sub1
git branch sub1 FETCH_HEAD
-git read-tree --prefix=subdir FETCH_HEAD
-git checkout subdir
-git commit -m 'initial-subdir-merge'
+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
-touch subdir/main-sub3
-git add subdir/main-sub3
-git commit -m 'main-sub3'
+create subdir/main-sub5
+git commit -m 'main-sub5'
-touch main-2
-git add main-2
-git commit -m 'main-2 boring'
+create main6
+git commit -m 'main6 boring'
-touch subdir/main-sub4
-git add subdir/main-sub4
-git commit -m 'main-sub4'
+create subdir/main-sub7
+git commit -m 'main-sub7'
git fetch ../subproj sub2
git branch sub2 FETCH_HEAD
-git merge -s subtree FETCH_HEAD
+git subtree merge --prefix=subdir FETCH_HEAD
git branch pre-split
-split1=$(git subtree split --onto FETCH_HEAD subdir --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"
-touch subdir/main-sub5
-git add subdir/main-sub5
-git commit -m 'main-sub5'
+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
-touch sub6
-git add sub6
-git commit -m 'sub6'
+create sub9
+git commit -m 'sub9'
cd ../mainline
-split2=$(git subtree split subdir --rejoin)
+split2=$(git subtree split --annotate='*' --prefix subdir --rejoin)
git branch split2 "$split2"
-touch subdir/main-sub7
-git add subdir/main-sub7
-git commit -m 'main-sub7'
+create subdir/main-sub10
+git commit -m 'main-sub10'
-split3=$(git subtree split 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 merge 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'