git/update

   1 #!/bin/sh
   2
   3 # --- Command line
   4 refname="$1"
   5 oldrev="$2"
   6 newrev="$3"
   7
   8 # --- Safety check
   9 if [ -z "$GIT_DIR" ]; then
  10     echo "Don't run this script from the command line." >&2
  11     echo " (if you want, you could supply GIT_DIR then run" >&2
  12     echo "  $0 <ref> <oldrev> <newrev>)" >&2
  13     exit 1
  14 fi
  15
  16 if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
  17     echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
  18     exit 1
  19 fi
  20
  21 # Don't allow merge commits on master
  22 if [ "$refname" = "refs/heads/master" ]
  23 then
  24     for rev in $(git rev-list $newrev --not $oldrev)
  25     do
  26         echo -n "Checking: $rev"
  27         if git rev-parse --verify --quiet $rev^2 > /dev/null
  28         then
  29             echo " (merge!)"
  30             echo
  31             echo "Merges not allowed on master. Rebase your changes instead."
  32             echo
  33             exit 1
  34         else
  35             echo " (ok)"
  36         fi
  37     done
  38 fi
  39