diff options
| author |   yexin <yexin13@huawei.com> | 2018-07-30 21:34:10 +0800 |
|---|---|---|
| committer | yexin <yexin13@huawei.com> | 2018-08-01 12:56:08 +0800 |
| commit | 8944a337eaaf3717b11e0e877c38bfec00d3b6bd (patch) | |
| tree | a97be1ff54b23e6b0d3be34835bc45648deb4ad1 /scripts/git/commit-msg-hook.py | |
| parent | 51884d17a7e9a5a6f15ac95707303a8479c1013f (diff) | |
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 <yexin13@huawei.com>
Diffstat (limited to 'scripts/git/commit-msg-hook.py')
| -rwxr-xr-x | scripts/git/commit-msg-hook.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |