diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-13 22:58:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-13 22:58:23 -0700 |
| commit | 460cccd3ba1d38fd64c9e83e40d58bcf3e9d7d2c (patch) | |
| tree | be398ecd58e7d7132ff93ac42cb223e1eddd3f76 | |
| parent | Fix type of combine-diff.c::show_patch_diff() (diff) | |
| parent | sample commit-msg hook: no silent exit on duplicate Signed-off-by lines (diff) | |
| download | git-460cccd3ba1d38fd64c9e83e40d58bcf3e9d7d2c.tar.gz git-460cccd3ba1d38fd64c9e83e40d58bcf3e9d7d2c.zip | |
Merge branch 'maint'
* maint:
sample commit-msg hook: no silent exit on duplicate Signed-off-by lines
Fix regex pattern in commit-msg
| -rw-r--r-- | templates/hooks--commit-msg | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/templates/hooks--commit-msg b/templates/hooks--commit-msg index 643822d235..0b906caa98 100644 --- a/templates/hooks--commit-msg +++ b/templates/hooks--commit-msg @@ -11,4 +11,8 @@ # This example catches duplicate Signed-off-by lines. test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1 /d')" + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} + |