[RESEND PATCH 1/3] Insert ACTIVESTATE_STRING in Git.pm

[RESEND PATCH 1/3] Insert ACTIVESTATE_STRING in Git.pm

[Alex Riesen]

[-- Attachment #1: Type: text/plain, Size: 255 bytes --]

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>
---
 perl/Git.pm |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

[-- Attachment #2: 0001-Insert-ACTIVESTATE_STRING-in-Git.pm.txt --]
[-- Type: text/plain, Size: 1302 bytes --]

From 12d5d319ac8643d43db4a7273832f67fa55ef750 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Mon, 22 Jan 2007 17:14:56 +0100
Subject: [PATCH 1/3] 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>
---
 perl/Git.pm |    7 ++++---
 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;
 }
 
-- 
1.5.0.rc2.g3f1a