Git Surgery blogpost - rewriting histories

script.sh

# part one, put on your scrubs
mkdir git-surgery
cd git-surgery
git clone [email protected]:crunchie84/blogpost-git-surgery-source.git source
cd source

# extract our application from the source repository
git subtree split -P Configuration/application-1 -b rewritten-history-application-1

# Prepare our new repository
cd ..
mkdir mavenized-solution
cd mavenized-solution
git init -b master
git pull ../source rewritten-history-application-1

# correct file paths
# we are in the /git-surgery/mavenized-solution folder
git filter-branch --force --prune-empty --tree-filter '
dir="src/main/configuration/application-1"
if [ ! -e "${dir}" ]
then
    mkdir -p "${dir}"
    git ls-tree --name-only $GIT_COMMIT | xargs -I files mv files "${dir}"
fi'

# clean up our mavenized-poc repository
cd .. # back to the git-surgery root folder
git clone [email protected]:crunchie84/blogpost-git-surgery-poc-target.git mavenized-poc
cd mavenized-poc
git filter-repo --path src/main/configuration/application-1 --invert-paths


#merge the cleaned-up mavenized-setup onto our source repository
# working dir = /git-surgery/mavenized-poc
git checkout -b mavenizing-application
cd ../mavenized-solution
git pull ../mavenized-poc mavenizing-application --allow-unrelated-histories