drifted-code.sh

drifted-code.sh

#!/bin/bash

BRANCH_1=$1
BRANCH_2=$2
# Can be "both", "merged", "not-merged"
SHOW=${SHOW:-'both'}

if [ -z ${BRANCH_1} ] || [ -z ${BRANCH_2} ]; then
    printf "Usage: ./drifted-commits.sh <ORIGIN_BRANCH> <TARGET_BRANCH>\n"
    exit 1
fi

red=$'\e[1;31m'
grn=$'\e[1;32m'
end=$'\e[0m'

IFS='
'
for line in `git log ^${BRANCH_1} ${BRANCH_2} --oneline`; do
    commit=$(echo ${line} | cut -d' ' -f1)
    result=$(GIT_PAGER=cat git branch -a -l --contains ${commit})
    merged=0
    for branch in ${result}; do
        if [[ "${branch}" == *"/open-release/"* ]]; then
            merged=1
            merged_branch=${branch}
        fi
    done
    if [ ${merged} -eq 1 ]; then
        if [ ${SHOW} = "both" ] || [ ${SHOW} = "merged" ]; then
            printf "${grn}"
            printf "${line} -> ${merged_branch}\n"
        fi
    else
        if [ ${SHOW} = "both" ] || [ ${SHOW} = "not-merged" ]; then
            printf "${red}"
            printf "${line} ( https://github.com/open-craft/edx-platform/commit/${commit} )\n"
        fi
    fi
    printf "${end}"
done