From: Ben Walton <bwalton@artsci.utoronto.ca>
To: gitster@pobox.com, git@vger.kernel.org
Cc: Ben Walton <bwalton@artsci.utoronto.ca>
Subject: [PATCH 3/3] cvsimport: standarize system() calls to external git tools
Date: Tue, 19 Jan 2010 14:03:10 -0500 [thread overview]
Message-ID: <1263927790-1872-3-git-send-email-bwalton@artsci.utoronto.ca> (raw)
In-Reply-To: <1263927790-1872-2-git-send-email-bwalton@artsci.utoronto.ca>
This patch standardizes calls to system() where. Instead of
system("git foo ... "), use system(qw(git foo ...)). This
standarization should see all calls made without the use of an 'sh -c'
process to split the arguments.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
---
git-cvsimport.perl | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index e838c2e..4853bf7 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -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>) {
}
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`;
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) {
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 $?;
}
}
--
1.6.5.3
prev parent reply other threads:[~2010-01-19 19:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-17 3:55 [PATCH] cvsimport: update to use non-dash git commands Ben Walton
2010-01-17 17:35 ` [PATCH] cvsimport: modernize and standardize external tool calling Ben Walton
2010-01-17 19:15 ` Junio C Hamano
2010-01-19 19:03 ` [PATCH 1/3] cvsimport: modernize callouts to git subcommands Ben Walton
2010-01-19 19:03 ` [PATCH 2/3] cvsimport: standarize open() calls to external git tools Ben Walton
2010-01-19 19:03 ` Ben Walton [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1263927790-1872-3-git-send-email-bwalton@artsci.utoronto.ca \
--to=bwalton@artsci.utoronto.ca \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).