script to merge two dispirate bits of history for dm adapters

repo_combine.bash

#!/bin/bash -e

repo_combine () {
    ADAPTER=$1

    if [ ! -d dm-more ]; then
        echo "Cloning solnic's adapter"
        git clone git://github.com/solnic/dm-more.git
        cd dm-more
        git fetch
        git checkout -b adapters_import origin/adapters_import
        cd ..
    fi

    echo "Spliting '$ADAPTER' from 'dm-more'"
    DIR=dm-$ADAPTER-adapter
    git clone --no-hardlinks dm-more $DIR
    cd $DIR
    git filter-branch --prune-empty --subdirectory-filter adapters/$DIR -- --all
    git reset --hard
    git gc --aggressive
    git prune
    echo "Done with the split!  Now for the fun part!"
    cd ..
    echo "cloning DM's repo"
    git clone git@github.com:datamapper/$DIR.git $DIR-core
    echo "Magic!"
    cd $DIR-core
    mkdir -p lib/${ADAPTER}_adapter
    git mv ${ADAPTER}_adapter.rb lib/${ADAPTER}_adapter/adapter.rb
    git commit -m "Moving adapter file to the right subdirectory"
    echo "Merge solnic's commits into ours"
    git remote add solnic ../$DIR
    git fetch solnic
    git merge -s recursive -X theirs solnic/adapters_import --no-commit
    echo "Now have a look at the tree in $DIR-core"
    echo "If it looks good, commit the merge!"
    cd -
}

for repo in "$@";
do
    repo_combine $repo
done