commit-msg hook script

commit-msg

#!/bin/sh
#
# Automatically adds branch name and branch description to every commit message. 
#
NAME=$(git branch | grep '*' | sed 's/* //') 
DESCRIPTION=$(git config branch."$NAME".description)
TEXT=$(cat "$1" | sed '/^#.*/d')

if [ -n "$TEXT" ]
then
    echo "$NAME"': '$(cat "$1" | sed '/^#.*/d') > "$1"
    if [ -n "$DESCRIPTION" ] 
    then
       echo "" >> "$1"
       echo $DESCRIPTION >> "$1"
    fi
else
    echo "Aborting commit due to empty commit message."
    exit 1
fi

you should put this in your prepare-commit-msg instead

@danwald you cannot start lines with # in the vim editor, that makes it harder to put in the prepare hook

A tiny amount of code golf for getting the branch name if you care:

NAME=$(git branch | sed -n -e 's/^* //gp')

This is great, thank you. It has cause a little problem when doing an interactive rebase and attempting to reword a commit.

Also, if you just wanna get your branch name, without using sed, grep nor awk:
NAME=$(git symbolic-ref --short HEAD)
NAME=$(git branch --show-current)