X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-commit-script;h=5c5f564a28e779de333ea96c35c95993f7535869;hb=58eaf287f1b25f6427b06bd72d8e555615828aeb;hp=de298b7b26ab212d62e62bc0f8b4fbf43a5b6774;hpb=e20ce6ac762589868e46603ee1223f2f852c4403;p=git.git

diff --git a/git-commit-script b/git-commit-script
index de298b7b..5c5f564a 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -6,10 +6,10 @@
 . git-sh-setup-script || die "Not a git archive"
 
 usage () {
-	die 'git commit [-a]  [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]'
+	die 'git commit [-a] [-v | --no-verify]  [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]'
 }
 
-all= logfile= use_commit= no_edit= log_given= log_message= verify= signoff=
+all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
 while case "$#" in 0) break;; esac
 do
   case "$1" in
@@ -67,6 +67,9 @@ do
   -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
     signoff=t
     shift ;;
+  -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
+    verify=
+    shift ;;
   -v|--v|--ve|--ver|--veri|--verif|--verify)
     verify=t
     shift ;;
@@ -101,56 +104,10 @@ git-update-cache -q --refresh || exit 1
 
 case "$verify" in
 t)
-	# 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.
-	perl -e '
-	    my $fh;
-	    my $found_bad = 0;
-	    my $filename;
-	    my $reported_filename = "";
-	    my $lineno;
-	    sub bad_line {
-		my ($why, $line) = @_;
-		if (!$found_bad) {
-		    print "*\n";
-		    print "* You have some suspicious patch lines:\n";
-		    print "*\n";
-		    $found_bad = 1;
-		}
-		if ($reported_filename ne $filename) {
-		    print "* In $filename\n";
-		    $reported_filename = $filename;
-		}
-		print "* $why (line $lineno)\n$line\n";
-	    }
-	    open $fh, "-|", qw(git-diff-cache -p -M --cached HEAD);
-	    while (<$fh>) {
-		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* 	/) {
-			bad_line("indent SP followed by a TAB", $_);
-		    }
-		}
-	    }
-	    exit($found_bad);
-	' || exit ;;
+	if test -x "$GIT_DIR"/hooks/pre-commit
+	then
+		"$GIT_DIR"/hooks/pre-commit || exit
+	fi
 esac
 
 PARENTS="-p HEAD"
@@ -255,6 +212,15 @@ case "$no_edit" in
 	${VISUAL:-${EDITOR:-vi}} .editmsg
 	;;
 esac
+
+case "$verify" in
+t)
+	if test -x "$GIT_DIR"/hooks/commit-msg
+	then
+		"$GIT_DIR"/hooks/commit-msg .editmsg || exit
+	fi
+esac
+
 grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
 grep -v -i '^Signed-off-by' .cmitmsg >.cmitchk
 if test -s .cmitchk
@@ -269,4 +235,9 @@ else
 fi
 ret="$?"
 rm -f .cmitmsg .editmsg .cmitchk
+
+if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
+then
+	"$GIT_DIR"/hooks/post-commit
+fi
 exit "$ret"