cvsimport: standarize open() calls to external git tools

Standardize calls to open() where external git tools are used as
part of a pipeline.  Instead of open(X, "git foo ... |)", use
open(X, "-|", qw(git foo ...)).  All calls are made without the
use of an 'sh -c' process to split the arguments.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index adffa0c3cd486bcbe1a9e0a459aa2d1ec00d79d1..e838c2e0cd73f1b15a5033f2180d519f42dbd93b 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -617,7 +617,7 @@ sub munge_user_filename {
        $last_branch = $opt_o;
        $orig_branch = "";
 } else {
        $last_branch = $opt_o;
        $orig_branch = "";
 } else {

-       open(F, "git symbolic-ref HEAD |") or
+       open(F, "-|", qw(git symbolic-ref HEAD)) or

                die "Cannot run git symbolic-ref: $!\n";
        chomp ($last_branch = <F>);
        $last_branch = basename($last_branch);
                die "Cannot run git symbolic-ref: $!\n";
        chomp ($last_branch = <F>);
        $last_branch = basename($last_branch);


@@ -631,8 +631,8 @@ sub munge_user_filename {
 
        # Get the last import timestamps
        my $fmt = '($ref, $author) = (%(refname), %(author));';
 
        # Get the last import timestamps
        my $fmt = '($ref, $author) = (%(refname), %(author));';

-       open(H, "git for-each-ref --perl --format='$fmt' $remote |") or
-               die "Cannot run git for-each-ref: $!\n";
+       my @cmd = ('git', 'for-each-ref', '--perl', "--format=$fmt", $remote);
+       open(H, "-|", @cmd) or die "Cannot run git for-each-ref: $!\n";

        while (defined(my $entry = <H>)) {
                my ($ref, $author);
                eval($entry) || die "cannot eval refs list: $@";
        while (defined(my $entry = <H>)) {
                my ($ref, $author);
                eval($entry) || die "cannot eval refs list: $@";


@@ -730,7 +730,7 @@ (\@\@)
 }
 
 sub write_tree () {
 }
 
 sub write_tree () {

-       open(my $fh, '-|', "git write-tree")
+       open(my $fh, '-|', qw(git write-tree))

                or die "unable to open git write-tree: $!";
        chomp(my $tree = <$fh>);
        is_sha1($tree)
                or die "unable to open git write-tree: $!";
        chomp(my $tree = <$fh>);
        is_sha1($tree)