From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 3 Nov 2011 17:27:22 +0000 (-0500)
Subject: external: commit imports with --no-verify
X-Git-Tag: upstream/1.8.0_pre1^2~3094
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7ef5aeb608a390b6ac88d7e6748c5a1b4a65e0c5;p=packages%2Fo%2Fopenafs.git

external: commit imports with --no-verify

Currently, importing external commits with import-external-git.pl may
fail if the current repository checks for whitespace errors, and the
external commits contain whitespace errors. So run the commit with
--no-verify, so we can make the commit before fixing up the whitespace
errors immediately afterwards.

Change-Id: I8c9c39550e118956aa847e0ec5c5b1181f42e6cb
Reviewed-on: http://gerrit.openafs.org/5796
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/external/import-external-git.pl b/src/external/import-external-git.pl
index d578d3558..a3dcd42df 100755
--- a/src/external/import-external-git.pl
+++ b/src/external/import-external-git.pl
@@ -208,7 +208,7 @@ eval {
     }
     undef $fh;
     $author="--author '$author'" if ($author);
-    system("git commit -F $tempdir/commit-msg $author") == 0
+    system("git commit --no-verify -F $tempdir/commit-msg $author") == 0
       or die "Commit failed : $!\n";
     if ($nowhitespace) {
 	print STDERR "WARNING: not fixing whitespace errors.\n";