{"thread":{"id":"13290","subject":"[updated PATCH] Fix whitespace","startedAt":"2008-04-27T17:32:46Z","lastAt":"2008-04-27T17:32:46Z","messageCount":1,"participants":["Stephen R. van den Berg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"75307","messageId":"20080427173246.10023.83500.stgit@aristoteles.cuci.nl","threadId":"13290","inReplyTo":null,"subject":"[updated PATCH] Fix whitespace","fromName":"Stephen R. van den Berg","fromEmail":"srb@cuci.nl","sentAt":"2008-04-27T17:32:46Z","receivedAt":"2008-04-27T17:32:46Z","isPatch":true,"sender":{"key":"srb@cuci.nl","avatar":"https://gravatar.com/avatar/f75389059e827634d38e9df2a9b6ecbd50028b5a454442efa1c7205b7ff29c6a?d=mp&s=160"},"body":"git-cvsimport uses real tabs whenever possible, a few cases had real\nspaces instead of tabs, fixed.\n\nSigned-off-by: Stephen R. van den Berg <srb@cuci.nl>\n---\n\n git-cvsimport.perl |   28 ++++++++++++++--------------\n 1 files changed, 14 insertions(+), 14 deletions(-)\n\n\ndiff --git a/git-cvsimport.perl b/git-cvsimport.perl\nindex 73109d6..4af60b8 100755\n--- a/git-cvsimport.perl\n+++ b/git-cvsimport.perl\n@@ -36,7 +36,7 @@ sub usage(;$) {\n \tmy $msg = shift;\n \tprint(STDERR \"Error: $msg\\n\") if $msg;\n \tprint STDERR <<END;\n-Usage: ${\\basename $0}     # fetch/update GIT from CVS\n+Usage: ${\\basename $0}\t   # fetch/update GIT from CVS\n        [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file]\n        [-p opts-for-cvsps] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k]\n        [-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit]\n@@ -99,13 +99,13 @@ sub read_repo_config {\n \t\tmy $arg = 'git config';\n \t\t$arg .= ' --bool' if ($o !~ /:$/);\n \n-        chomp(my $tmp = `$arg --get cvsimport.$key`);\n+\tchomp(my $tmp = `$arg --get cvsimport.$key`);\n \t\tif ($tmp && !($arg =~ /--bool/ && $tmp eq 'false')) {\n-            no strict 'refs';\n-            my $opt_name = \"opt_\" . $key;\n-            if (!$$opt_name) {\n-                $$opt_name = $tmp;\n-            }\n+\t    no strict 'refs';\n+\t    my $opt_name = \"opt_\" . $key;\n+\t    if (!$$opt_name) {\n+\t\t$$opt_name = $tmp;\n+\t    }\n \t\t}\n \t}\n }\n@@ -264,8 +264,8 @@ sub conn {\n \t\t\t$s = IO::Socket::INET->new(PeerHost => $proxyhost, PeerPort => $proxyport);\n \t\t\tdie \"Socket to $proxyhost: $!\\n\" unless defined $s;\n \t\t\t$s->write(\"CONNECT $serv:$port HTTP/1.1\\r\\nHost: $serv:$port\\r\\n\\r\\n\")\n-\t                        or die \"Write to $proxyhost: $!\\n\";\n-\t                $s->flush();\n+\t\t\t\tor die \"Write to $proxyhost: $!\\n\";\n+\t\t\t$s->flush();\n \n \t\t\t$rep = <$s>;\n \n@@ -591,11 +591,11 @@ unless (-d $git_dir) {\n \t\t$branch_date{$head} = $1;\n \t}\n \tclose(H);\n-        if (!exists $branch_date{$opt_o}) {\n+\tif (!exists $branch_date{$opt_o}) {\n \t\tdie \"Branch '$opt_o' does not exist.\\n\".\n \t\t       \"Either use the correct '-o branch' option,\\n\".\n \t\t       \"or import to a new repository.\\n\";\n-        }\n+\t}\n }\n \n -d $git_dir\n@@ -624,7 +624,7 @@ unless ($opt_P) {\n \t\tmy @opt;\n \t\t@opt = split(/,/,$opt_p) if defined $opt_p;\n \t\tunshift @opt, '-z', $opt_z if defined $opt_z;\n-\t\tunshift @opt, '-q'         unless defined $opt_v;\n+\t\tunshift @opt, '-q'\t   unless defined $opt_v;\n \t\tunless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) {\n \t\t\tpush @opt, '--cvs-direct';\n \t\t}\n@@ -718,7 +718,7 @@ sub commit {\n \t\tdie \"read-tree failed: $?\\n\" if $?;\n \t    }\n \t}\n-        $ENV{GIT_INDEX_FILE} = $index{$branch};\n+\t$ENV{GIT_INDEX_FILE} = $index{$branch};\n \n \tupdate_index(@old, @new);\n \t@old = @new = ();\n@@ -776,7 +776,7 @@ sub commit {\n \t\tor die \"Cannot write branch $branch for update: $!\\n\";\n \n \tif ($tag) {\n-\t        my ($xtag) = $tag;\n+\t\tmy ($xtag) = $tag;\n \t\t$xtag =~ s/\\s+\\*\\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY **\n \t\t$xtag =~ tr/_/\\./ if ( $opt_u );\n \t\t$xtag =~ s/[\\/]/$opt_s/g;\n"}]}