diff options
author | Ben Kibbey <[email protected]> | 2015-08-15 00:56:14 +0000 |
---|---|---|
committer | Ben Kibbey <[email protected]> | 2015-08-15 00:56:14 +0000 |
commit | aa89252256fc87d637d3793a1fabdbee207967a4 (patch) | |
tree | b5a325d3120370417498981db36cc3c1b3293cae /build-aux/git-hooks/commit-msg | |
parent | Parse the INQUIRE_MAXLEN status message. (diff) | |
parent | Also check the return code in gpg_sign(). (diff) | |
download | gpgme-aa89252256fc87d637d3793a1fabdbee207967a4.tar.gz gpgme-aa89252256fc87d637d3793a1fabdbee207967a4.zip |
Merge branch 'master' into passphrase-inquirebjk/passphrase-inquire
Diffstat (limited to 'build-aux/git-hooks/commit-msg')
-rwxr-xr-x | build-aux/git-hooks/commit-msg | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg index 5a697c7a..3ca918b2 100755 --- a/build-aux/git-hooks/commit-msg +++ b/build-aux/git-hooks/commit-msg @@ -86,11 +86,17 @@ sub check_msg($$) 2 <= @line && length $line[1] and return 'second line must be empty'; + # See git-commit(1), this is the --cleanup=scissors option. Everything + # after and including this line gets ignored. + my $marker = '# ------------------------ >8 ------------------------'; + # Limit line length to allow for the ChangeLog's leading TAB. foreach my $line (@line) { 72 < length $line && $line =~ /^[^#]/ and return 'line longer than 72 characters'; + + last if $line eq $marker; } return ''; |