Momentum-Apps/.utils/update-subtree.sh

#!/bin/bash
set -e

path="${GIT_PREFIX%/}"
while read repo branch subdir; do
    if [ "${repo:0:1}" = "#" ]; then
        continue
    fi
    exec 69>&1
    if [ "${subdir}" = "/" ]; then
        result="$(git subtree pull -P "${path}" "${repo}" "${branch}" -m "Merge ${path} from ${repo}" 2>&1 | tee /proc/self/fd/69)"
    else
        result="$(bash .utils/subtree-subdir-helper.sh "${path}" "${repo}" "${branch}" "${subdir}" merge 2>&1 | tee /proc/self/fd/69)"
    fi
    if grep "Automatic merge failed; fix conflicts and then commit the result." <<< "$result" > /dev/null; then
        echo "Waiting for current index to be resolved..."
        while ! git diff --quiet || ! git diff --cached --quiet || ! git merge HEAD &> /dev/null; do
            sleep 1
        done
    fi
done < "${GIT_PREFIX}.gitsubtree"