#!/bin/bash set -e if [ "$(git rev-parse --show-prefix)" != "" ]; then echo "Must be in root of git repo!" exit fi if [ "${1}" = "" ] || [ "${2}" = "" ] || [ "${3}" = "" ] || [ "${4}" = "" ] || [ "${5}" = "" ]; then echo "Usage: " exit fi path="${1}" repo="${2}" branch="${3}" subdir="${4}" action="${5}" prev="$(git branch --show-current)" temp="$(rev <<< "${repo%/}" | cut -d/ -f1,2 | rev | tr / -)-${branch}" fetch="_fetch-${temp}" split="_split-${temp}-$(tr / - <<< "${subdir}")" git fetch --no-tags "${repo}" "${branch}:${fetch}" git checkout "${fetch}" exec 420>&1 result="$(git subtree split -P "${subdir}" -b "${split}" 2>&1 | tee /proc/self/fd/420)" if grep "is not an ancestor of commit" <<< "$result" > /dev/null; then echo "Resetting split branch..." git branch -D "${split}" git subtree split -P "${subdir}" -b "${split}" fi git checkout "${prev}" git subtree "${action}" -P "${path}" "${split}" -m "${action^} ${path} from ${repo}"