From 8944a337eaaf3717b11e0e877c38bfec00d3b6bd Mon Sep 17 00:00:00 2001 From: yexin Date: Mon, 30 Jul 2018 21:34:10 +0800 Subject: Fix: commit-msg hook conflicts with git-review Fix bug that the original commit-msg hook will conflict with the one from git-review. Also add an option (RMWS) to CMakelists to enable autoremove trailing whitespace when commit changes. Change-Id: I78a34758d1cf2501814e60b403a25df40de833f9 Signed-off-by: yexin --- scripts/git/commit-msg-hook.py | 2 +- scripts/git/pre-commit | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 scripts/git/pre-commit (limited to 'scripts') diff --git a/scripts/git/commit-msg-hook.py b/scripts/git/commit-msg-hook.py index 719ff22..9c397ed 100755 --- a/scripts/git/commit-msg-hook.py +++ b/scripts/git/commit-msg-hook.py @@ -123,7 +123,7 @@ with open(sys.argv[1], 'r') as commit_msg: for line in contents: dup = line.lstrip() - if dup.startswith('#'): + if dup.startswith('#') or dup.startswith("Change-Id") or dup.startswith("Signed-of-by"): continue if subject is True: ret = check_subject(line) diff --git a/scripts/git/pre-commit b/scripts/git/pre-commit new file mode 100755 index 0000000..58cd14f --- /dev/null +++ b/scripts/git/pre-commit @@ -0,0 +1,14 @@ +#!/bin/bash + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# autoremove trailing whitespace +for file in `git diff-index --check --cached $against -- | sed '/^[-+]/d' | sed -r 's/:[0-9]+:.*//' | uniq` ; do + sed -i 's/[ \t]*$//g' $file +done -- cgit 1.2.3-korg