From e4f801a594dd3db07ad7adcbe0d7065c793503b7 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 7 Oct 2020 14:28:11 +0200 Subject: [PATCH] Add also the pre-commit and post-merge hooks, they are useful too. The pre-commit is a bit stripped down compared to the LibreOffice master. Change-Id: I162ec1007fa1db5bd8fca522d712db50dafaf998 --- .git-hooks/post-merge | 12 +++ .git-hooks/pre-commit | 204 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100755 .git-hooks/post-merge create mode 100755 .git-hooks/pre-commit diff --git a/.git-hooks/post-merge b/.git-hooks/post-merge new file mode 100755 index 0000000000..b1be51202a --- /dev/null +++ b/.git-hooks/post-merge @@ -0,0 +1,12 @@ +#!/bin/sh + +# Do not warn if there were no real merge +git rev-parse -q --verify HEAD^2 >/dev/null || exit + +echo +echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +echo "! You probably used 'git pull' instead of 'git pull -r' !" +echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" +echo +echo "You can still fix it - please do 'git pull -r' now." +echo diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit new file mode 100755 index 0000000000..255de74083 --- /dev/null +++ b/.git-hooks/pre-commit @@ -0,0 +1,204 @@ +#!/usr/bin/env perl + +# A hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message +# if it wants to stop the commit. + +use strict; +use lib "solenv/clang-format"; +#use File::Copy; +#use Cwd; + +$ENV{LC_ALL} = "C"; + +sub check_whitespaces($) +{ + my ($h) = @_; + my $src_limited = "c|cpp|cxx|h|hpp|hrc|hxx|idl|inl|java|swift|map|MK|pmk|pl|pm|sdi|sh|src|tab|ui|xcu|xml|xsl|py"; + my $src_full = "c|cpp|cxx|h|hpp|hrc|hxx|idl|inl|java|swift|map|mk|MK|pmk|pl|pm|sdi|sh|src|tab|ui|xcu|xml|xsl|py"; + + my $found_bad = 0; + my $filename; + my $reported_filename = ""; + my $lineno; + sub bad_line + { + my ($why, $line, $file_filter) = @_; + if (!defined $file_filter || $filename =~ /\.($file_filter)$/) + { + if (!$found_bad) + { + print STDERR "*\n"; + print STDERR "* You have some suspicious patch lines:\n"; + print STDERR "*\n"; + $found_bad = 1; + } + if ($reported_filename ne $filename) + { + print STDERR "* In $filename\n"; + $reported_filename = $filename; + } + print STDERR "* $why (line $lineno)\n"; + print STDERR "$filename:$lineno:$line\n"; + } + } + open( FILES, "git-diff-index -p -M --cached $h |" ) || die "Cannot run git diff-index."; + while () + { + if (m|^diff --git a/(.*) b/\1$|) + { + $filename = $1; + next; + } + if (/^@@ -\S+ \+(\d+)/) + { + $lineno = $1 - 1; + next; + } + if (/^ /) + { + $lineno++; + next; + } + if (s/^\+//) + { + $lineno++; + chomp; + if (/\s$/) + { + bad_line("trailing whitespace", $_ , $src_limited); + } + if (/\r$/) + { + bad_line("DOS lineends", $_ , $src_limited); + } + if (/\s* /) + { + bad_line("indent with Tab", $_, $src_limited); + } + if (/^(?:[<>=]){7}$/) + { + bad_line("unresolved merge conflict", $src_full); + } + if (/SAL_DEBUG/) + { + bad_line("temporary debug in commit", $_, $src_limited); + } + if ((/OOXMLIMPORT/) and ($filename =~ /ooxmlexport/)) + { + bad_line("OOXMLIMPORT definition used in a ooxmlexport file", $_, "cxx"); + } + if ((/OOXMLEXPORT/) and ($filename =~ /ooxmlimport/)) + { + bad_line("OOXMLEXPORT definition used in a ooxmlimport file", $_, "cxx"); + } + if (/True<\/property>/) + { + bad_line("use font attributes instead of use-markup", $_, "ui"); + } + if (//) + { + print("ERROR: You have a suspicious author identity: '$author'\n"); + exit(1); + } +} + +# Do the work :-) + +# Initial commit: diff against an empty tree object +my $against="4b825dc642cb6eb9a060e54bf8d69288fbee4904"; +if ( system( "git rev-parse --verify HEAD >/dev/null 2>&1" ) == 0 ) +{ + $against="HEAD" +} + +# If you want to allow non-ascii filenames set this variable to true. +my $allownonascii=`git config hooks.allownonascii`; + +# Cross platform projects tend to avoid non-ascii filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if ( $allownonascii ne "true" && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + `git diff --cached --name-only --diff-filter=A -z $against | \ + LC_ALL=C tr -d '[ -~]\\0'` ne "" ) +{ + print <) +{ + if (/\.ui$/) # .ui files can get large + { + continue; + } + if (/\.xsl$/) # XSLT + { + continue; + } + my $size = `git cat-file -s :$_`; + # For now let's say large is 500KB + my $limit = 500; + if ($size > $limit * 1024) + { + print "Error: Attempt to add a large file: $_, pleasy try to fit into $limit KB.\n"; + exit( 1 ); + } +} + +# fix whitespace in code +check_whitespaces( $against); + +# catch missing author info +check_author(); + +# all OK +exit( 0 ); +# vi:set shiftwidth=4 expandtab: