Browse Source

cvsimport: standarize system() calls to external git tools

This patch standardizes calls to system() where external git tools are
called.  Instead of system("git foo ... "), use system(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>
maint
Ben Walton 15 years ago committed by Junio C Hamano
parent
commit
91fe7324c5
  1. 10
      git-cvsimport.perl

10
git-cvsimport.perl

@ -609,9 +609,9 @@ $orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE}; @@ -609,9 +609,9 @@ $orig_git_index = $ENV{GIT_INDEX_FILE} if exists $ENV{GIT_INDEX_FILE};
my %index; # holds filenames of one index per branch

unless (-d $git_dir) {
system("git init");
system(qw(git init));
die "Cannot init the GIT db at $git_tree: $?\n" if $?;
system("git read-tree");
system(qw(git read-tree));
die "Cannot init an empty tree: $?\n" if $?;

$last_branch = $opt_o;
@ -993,7 +993,7 @@ while (<CVS>) { @@ -993,7 +993,7 @@ while (<CVS>) {
}
commit();
if (($commitcount & 1023) == 0) {
system("git repack -a -d");
system(qw(git repack -a -d));
}
$state = 1;
} elsif ($state == 11 and /^-+$/) {
@ -1017,7 +1017,7 @@ my $line = `git count-objects`; @@ -1017,7 +1017,7 @@ my $line = `git count-objects`;
if ($line =~ /^(\d+) objects, (\d+) kilobytes$/) {
my ($n_objects, $kb) = ($1, $2);
1024 < $kb
and system("git repack -a -d");
and system(qw(git repack -a -d));
}

foreach my $git_index (values %index) {
@ -1059,7 +1059,7 @@ if ($orig_branch) { @@ -1059,7 +1059,7 @@ if ($orig_branch) {
if ($opt_r && $opt_o ne 'HEAD');
system('git', 'update-ref', 'HEAD', "$orig_branch");
unless ($opt_i) {
system('git checkout -f');
system(qw(git checkout -f));
die "checkout failed: $?\n" if $?;
}
}

Loading…
Cancel
Save