LU-13152 llapi: llapi_layout_get_by_xattr groks DoM

[fs/lustre-release.git] / contrib / git-hooks / prepare-commit-msg

diff --git a/contrib/git-hooks/prepare-commit-msg b/contrib/git-hooks/prepare-commit-msg
index c0cc1a5..e4a94c9 100755 (executable)
--- 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.