summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2013-01-30 10:09:55 -0500
committerJasper St. Pierre <jstpierre@mecheye.net>2013-02-01 17:08:39 -0500
commitde84ea0cf212c251e099f456bb675492f664e93d (patch)
tree39862990ee826eff4d79f4c6ccc6e1f3a5003ac1
parent40766841ac5f5319ab0ab6dd29d6fce70eaf9f1b (diff)
downloadgobject-introspection-de84ea0cf212c251e099f456bb675492f664e93d.tar.gz
Remove the insane pre-commit hook
I'm sick and tired of this. https://bugzilla.gnome.org/show_bug.cgi?id=693040
-rw-r--r--Makefile.am1
-rwxr-xr-xmisc/pre-commit86
2 files changed, 0 insertions, 87 deletions
diff --git a/Makefile.am b/Makefile.am
index 70164581..5a4044f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,6 @@ EXTRA_DIST += \
check-local:
gtester --verbose $(GTESTER_PROGS)
- @test ! -d $(top_srcdir)/.git || (test -f $(top_srcdir)/.git/hooks/pre-commit || install misc/pre-commit .git/hooks/pre-commit)
@echo "TEST: PEP-8 INQUISITION"
@find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat --exclude=config.py
@echo "TEST: Annotation pattern programs"
diff --git a/misc/pre-commit b/misc/pre-commit
deleted file mode 100755
index 1f37d866..00000000
--- a/misc/pre-commit
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-#
-# An example 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.
-#
-# To enable this hook, make this file executable.
-
-# This is slightly modified from Andrew Morton's Perfect Patch.
-# Lines you introduce should not have trailing whitespace.
-# Also check for an indentation that has SP before a TAB.
-
-if git-rev-parse --verify HEAD 2>/dev/null
-then
- git-diff-index -p -M --cached HEAD --
-else
- # NEEDSWORK: we should produce a diff with an empty tree here
- # if we want to do the same verification for the initial import.
- :
-fi |
-perl -e '
- my $found_bad = 0;
- my $filename;
- my $reported_filename = "";
- my $lineno;
- sub bad_line {
- my ($why, $line) = @_;
- 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";
- }
- 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", $_);
- }
- if (/^\s* \t/) {
- bad_line("indent SP followed by a TAB", $_);
- }
- if (/^([<>])\1{6} |^={7}$/) {
- bad_line("unresolved merge conflict", $_);
- }
- }
- }
- exit($found_bad);
-'
-
-CHECK_FILE=.make-check-passed
-if ! test -f $CHECK_FILE; then
- echo "You need to run make check before committing"
- exit 1
-fi
-
-# Need to run make check at least once every 20 minutes
-MODIFIED=`stat -c %Y $CHECK_FILE`
-NOW=`date +%s`
-DELTA=$(($NOW-MODIFIED))
-if test "$DELTA" -ge "1200"; then
- echo "You haven't ran make check in $((DELTA / 60)) minutes."
- exit 1
-fi
-