summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-01-22 16:14:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-22 17:44:25 (GMT)
commitd3b1785f3fe681f6837a6110008af98003f675d3 (patch)
tree37c4a1b2b5d6adbe3ebf8eda65b1b8e249d90049
parent18af29f247f79b6fb61335f98a21daea67f5632f (diff)
downloadgit-d3b1785f3fe681f6837a6110008af98003f675d3.zip
git-d3b1785f3fe681f6837a6110008af98003f675d3.tar.gz
git-d3b1785f3fe681f6837a6110008af98003f675d3.tar.bz2
Insert ACTIVESTATE_STRING in Git.pm
Also add "git" to the pipe parameters, otherwise it does not work at all, as no git commands are usable out of git context. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--perl/Git.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl/Git.pm b/perl/Git.pm
index 3474ad3..58414e3 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -736,7 +736,7 @@ sub _command_common_pipe {
_check_valid_cmd($cmd);
my $fh;
- if ($^O eq '##INSERT_ACTIVESTATE_STRING_HERE##') {
+ if ($^O eq 'MSWin32') {
# ActiveState Perl
#defined $opts{STDERR} and
# warn 'ignoring STDERR option - running w/ ActiveState';
@@ -809,8 +809,9 @@ sub TIEHANDLE {
# FIXME: This is probably horrible idea and the thing will explode
# at the moment you give it arguments that require some quoting,
# but I have no ActiveState clue... --pasky
- my $cmdline = join " ", @params;
- my @data = qx{$cmdline};
+ # Let's just hope ActiveState Perl does at least the quoting
+ # correctly.
+ my @data = qx{git @params};
bless { i => 0, data => \@data }, $class;
}