X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=contrib%2Fgit-hooks%2Fprepare-commit-msg;h=e4a94c9bede7296f86affdc3989f3ba588fc2ea9;hp=c0cc1a5224c610337751a705ae7baa89b78a6d85;hb=af437d84a3be785f25aaf4ccad6e1313ffa3cde1;hpb=b1c8f737c8bbe862930cc0f174bd478ba42f7ffe

diff --git a/contrib/git-hooks/prepare-commit-msg b/contrib/git-hooks/prepare-commit-msg
index c0cc1a5..e4a94c9 100755
--- a/contrib/git-hooks/prepare-commit-msg
+++ b/contrib/git-hooks/prepare-commit-msg
@@ -31,7 +31,10 @@ grep -qs "^$SIGNOFF" "$1" || echo "# $SIGNOFF" >> "$1"
 if [ -x "$CHECKPATCH" ]; then
 	echo "" >> "$1"
 	echo "#" >> "$1"
-	git diff --cached | $CHECKPATCH $CHECKPATCH_OPTS - | sed -e 's/^/# /' >> "$1"
+	[ -d ".git/rebase-apply" -o -d ".git/rebase-merge" ] &&
+		DIFFOPT="HEAD" || DIFFOPT="--cached"
+	git diff $DIFFOPT | $CHECKPATCH $CHECKPATCH_OPTS - |
+		sed -e 's/^/# /' >> "$1"
 fi
 
 # Cause Vim to wrap text at 70 columns to match commit message style.