diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-07 00:04:01 -0700 | 
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-07 00:04:01 -0700 | 
| commit | a6080a0a44d5ead84db3dabbbc80e82df838533d (patch) | |
| tree | 37360b8334cf8459609d1fae72f8213947858cc0 /git-cvsimport.perl | |
| parent | d44c782bbd6b0e806e056f9e8ff8cd8e426e67a3 (diff) | |
| download | git-a6080a0a44d5ead84db3dabbbc80e82df838533d.tar.gz | |
War on whitespace
This uses "git-apply --whitespace=strip" to fix whitespace errors that have
crept in to our source files over time.  There are a few files that need
to have trailing whitespaces (most notably, test vectors).  The results
still passes the test, and build result in Documentation/ area is unchanged.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-cvsimport.perl')
| -rwxr-xr-x | git-cvsimport.perl | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 4e6c9c6cc7..3225a2a25d 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -145,7 +145,7 @@ my $cvs_tree;  if ($#ARGV == 0) {  	$cvs_tree = $ARGV[0];  } elsif (-f 'CVS/Repository') { -	open my $f, '<', 'CVS/Repository' or  +	open my $f, '<', 'CVS/Repository' or  	    die 'Failed to open CVS/Repository';  	$cvs_tree = <$f>;  	chomp $cvs_tree; @@ -434,7 +434,7 @@ sub file {  	my ($self,$fn,$rev) = @_;  	my $res; -	my ($fh, $name) = tempfile('gitcvs.XXXXXX',  +	my ($fh, $name) = tempfile('gitcvs.XXXXXX',  		    DIR => File::Spec->tmpdir(), UNLINK => 1);  	$self->_file($fn,$rev) and $res = $self->_line($fh); @@ -520,8 +520,8 @@ sub is_sha1 {  sub get_headref ($$) {      my $name    = shift; -    my $git_dir = shift;  -     +    my $git_dir = shift; +      my $f = "$git_dir/refs/heads/$name";      if (open(my $fh, $f)) {  	    chomp(my $r = <$fh>); @@ -771,7 +771,7 @@ sub commit {  		$xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **  		$xtag =~ tr/_/\./ if ( $opt_u );  		$xtag =~ s/[\/]/$opt_s/g; -		 +  		my $pid = open2($in, $out, 'git-mktag');  		print $out "object $cid\n".  		    "type commit\n". @@ -788,7 +788,7 @@ sub commit {  		     $? != 0 or $tagobj !~ /^[0123456789abcdef]{40}$/ ) {  		    die "Cannot create tag object $xtag: $!\n";  	        } -		 +  		open(C,">$git_dir/refs/tags/$xtag")  			or die "Cannot create tag $xtag: $!\n";  | 
