git-test-merge

git-test-merge

#!/bin/sh -e

if ! git rev-parse --quiet --verify >/dev/null "${1}"
then
  echo 1>&2 Not something we can merge: "${1}"
  exit 1
fi

if test -n "$(git status --porcelain --untracked-files=no)"
then
  echo 1>&2 Working directory must be clean.
  exit 1
fi

trap '{
  if git rev-parse --quiet --verify >/dev/null MERGE_HEAD
  then
    echo Rewinding merge.
    git merge --abort
  fi
}' EXIT

if git merge --quiet --no-commit --no-ff 2>/dev/null "${@}"
then
  echo Merge will be successful.
else
  echo Merge will cause conflicts.
  exit 1
fi