[git,django,south] hook to warn about migrations from merges

post-commit

#!/bin/sh

# was it a merge?
if test `git rev-list --parents -n 1 HEAD | wc -w` -lt 3; then
  exit 0;
fi

if test `git rev-list ^HEAD^1 HEAD^@ -- sq/migrations | wc -l` -gt 0; then
  echo '#'
  echo '# WARNING: Migrations detected in merge; you may want to apply them.'
  echo '#'
fi

post-merge

#!/bin/sh

if test `git rev-list ^HEAD^1 HEAD^@ -- sq/migrations | wc -l` -gt 0; then
  echo '#'
  echo '# WARNING: Migrations detected in merge; you may want to apply them.'
  echo '#'
fi