Hooks to automerge (fix) branches

automerge

#!/bin/sh

# Put in directory .git/hooks

branch=$(git rev-parse --abbrev-ref --quiet HEAD)
echo "Running automerge for branch $branch"

config_automergeto="branch.$branch.automergeto"
automergeto=$(git config $config_automergeto)
if [ -n "$automergeto" ]; then
  echo "Auto merge to these branches: $automergeto"
  for automergeto_branch in $automergeto
  do
    echo '*******************************************************************************'
    echo "** Auto merging from $branch to $automergeto_branch"
    git checkout $automergeto_branch && git pull --ff-only && git merge $branch
    if [[ $? != 0 ]]; then
      echo "** AUTOMERGE from $branch to $automergeto_branch FAILED !!!"
      git merge --abort
    fi
    echo '*******************************************************************************'
  done
  git checkout $branch
else
  echo "Automerge disabled (no config value for $config_automergeto)"
fi

Automerge2

#!/bin/sh

# Explanation
#
# 1/ Put the 3 scripts (2 hooks) in .git/hooks of your repository
# 2/ Adjust .git/config to set merge targets:
#     e.g.
#
#       [branch "fix-MyFixBranch"]
#         remote = origin
#         merge = refs/heads/fix-MyFixBranch
#         automergeto = MyReleaseBranch master
#
#    (the last line is needs to be added)
#
# This also works recusively (when merge target is again configured to merge through to other branches).
# Tested with command line & GIT Extensions.

post-commit

#!/bin/sh

# Put in directory .git/hooks

echo 'Begin executing post-commit hook'
./.git/hooks/automerge
echo 'Done executing post-commit hook'

post-merge

#!/bin/sh

# Put in directory .git/hooks

echo 'Begin executing post-merge hook'
./.git/hooks/automerge
echo 'Done executing post-merge hook'