From ae1d000b71514ab8a62496dd712b8fe4be224e18 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Tue, 16 Nov 2010 12:38:06 -0500 Subject: [PATCH] external import script should rebase away whitespace and provide an option not to. Change-Id: I3a81de0c4786cfc9e5d4b92bb175528ed1334b90 Reviewed-on: http://gerrit.openafs.org/3315 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/external/import-external-git.pl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/external/import-external-git.pl b/src/external/import-external-git.pl index 45b813863..d578d3558 100755 --- a/src/external/import-external-git.pl +++ b/src/external/import-external-git.pl @@ -21,7 +21,9 @@ use Cwd; my $help; my $man; my $externalDir; +my $nowhitespace; my $result = GetOptions("help|?" => \$help, + "nofixwhitespace" => \$nowhitespace, "man" => \$man, "externaldir=s" => \$externalDir); @@ -208,6 +210,12 @@ eval { $author="--author '$author'" if ($author); system("git commit -F $tempdir/commit-msg $author") == 0 or die "Commit failed : $!\n"; + if ($nowhitespace) { + print STDERR "WARNING: not fixing whitespace errors.\n"; + } else { + system("git rebase --whitespace=fix HEAD^") == 0 + or print STDERR "WARNING: Fixing whitespace errors failed.\n"; + } } }; @@ -242,6 +250,7 @@ import-external-git [options] [] --help brief help message --man full documentation --externalDir exact path to import into + --nofixwhitespace don't apply whitespace fixes =head1 DESCRIPTION -- 2.39.5