|
|
|
@ -16,9 +16,16 @@
|
|
|
|
|
|
|
|
|
|
set -e
|
|
|
|
|
|
|
|
|
|
USAGE=$(cat <<EOF
|
|
|
|
|
Usage:
|
|
|
|
|
$0 <main_branch> <topic_branch>"
|
|
|
|
|
|
|
|
|
|
<main_branch> will be fast-forwarded to <topic_branch> if possible."
|
|
|
|
|
EOF
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if [ $# -ne 2 ] ; then
|
|
|
|
|
echo "Usage: $0 <main_branch> <topic_branch>"
|
|
|
|
|
echo "<main_branch> will be fast-forwarded to <topic_branch> if possible."
|
|
|
|
|
printf '%s\n' "$USAGE" >&2
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
@ -29,10 +36,10 @@ echo "Trying to merge $TOPIC_BRANCH into $MAIN_BRANCH..."
|
|
|
|
|
|
|
|
|
|
DIFF="$(git rev-list "$TOPIC_BRANCH".."$MAIN_BRANCH")"
|
|
|
|
|
if [ -z "$DIFF" ] ; then
|
|
|
|
|
echo "$TOPIC_BRANCH contains all the commits of $MAIN_BRANCH."
|
|
|
|
|
echo -- "$TOPIC_BRANCH contains all the commits of $MAIN_BRANCH."
|
|
|
|
|
echo "Fast-forwarding $MAIN_BRANCH to $TOPIC_BRANCH."
|
|
|
|
|
git branch -f "$MAIN_BRANCH" "$TOPIC_BRANCH"
|
|
|
|
|
else
|
|
|
|
|
echo "$TOPIC_BRANCH does not contain all the commits of $MAIN_BRANCH."
|
|
|
|
|
echo -- "$TOPIC_BRANCH does not contain all the commits of $MAIN_BRANCH."
|
|
|
|
|
echo "Fast-forward impossible, aborting."
|
|
|
|
|
fi
|
|
|
|
|