Demonstration of git subtree failures

gistfile1.txt

mkdir main
mkdir sub
cd sub
git init
echo "sub" > sub.txt
git add sub.txt
git commit sub.txt -m "Adding initial subtree content"
git checkout -b temp
cd ../main
git init
echo "main" > main.txt
git add main.txt
git commit -m "Adding initial main content (this commit will be incorrectly included in the ignore-joins case)"
git subtree add ../sub master --prefix sub
echo "new" > sub/new.txt
git add sub/new.txt
git commit -m "Adding new content for subtree"
git checkout -b side
echo "side" > side.txt
git add side.txt
git commit -m "Adding unrelated side branch content"
git checkout master
echo "master" > master.txt
git add master.txt
git commit -m "Adding unrelated master content (needed to expand commit graph to expose rejoin failure)"
git subtree split --prefix sub -b first_split --rejoin
git push ../sub first_split:master
git merge side -m "Merging side branch"
echo "final" > sub/final.txt
git add sub/final.txt
git commit -m "Adding new sub file to ensure changes are present for subtree"
git subtree split --prefix sub -b failed_rejoin
git subtree split --prefix sub --ignore-joins -b failed_ignore_joins