From 7ef5aeb608a390b6ac88d7e6748c5a1b4a65e0c5 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Thu, 3 Nov 2011 12:27:22 -0500 Subject: [PATCH] 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 Reviewed-by: Derrick Brashear --- src/external/import-external-git.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/external/import-external-git.pl b/src/external/import-external-git.pl index d578d35581..a3dcd42dff 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";