- # Simple branch update, one mail per commit.
- lastrev=$oldrev
- for step in $(git rev-list --reverse $oldrev..$newrev)
- do
- generate_email $lastrev $step $refname | send_mail
- lastrev=$step
- done
+ # Get all revisions from old to new.
+ revlist=$(git rev-list --reverse $oldrev..$newrev)
+ no_merges=true
+ # Check for merges.
+ for rev in $revlist
+ do
+ if ($no_merges && git rev-parse --verify --quiet "$rev"^2 > /dev/null)
+ then
+ echo "Merge detected: $rev. Sending all commits in a single email."
+ no_merges=false
+ fi
+ done
+ if $no_merges
+ then
+ # Simple branch update, one mail per commit.
+ echo "Sending one email per commit."
+ lastrev=$oldrev
+ for step in $revlist
+ do
+ echo "Sending: $(git log -n1 --oneline $step)"
+ generate_email $lastrev $step $refname | send_mail
+ lastrev=$step
+ done
+ else
+ # There's a merge -- just one email.
+ generate_email $oldrev $newrev $refname | send_mail
+ fi