On Wed, Sep 4, 2013 at 2:24 PM, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote:
> From: Johannes Sixt <j6t@xxxxxxxx>
>
> Back in 21e9757e (Hack git-add--interactive to make it work with
> ActiveState Perl, 2007-08-01), the invocation of external commands was
> changed to use qx{} on Windows. The rationale was that the command
> interpreter on Windows is not a POSIX shell, but rather Windows's CMD.
> That patch was wrong to include 'msys' in the check whether to use qx{}
> or not: 'msys' identifies MSYS perl as shipped with Git for Windows,
> which does not need the special treatment; qx{} should be used only with
> ActiveState perl, which is identified by 'MSWin32'.
>
> Signed-off-by: Johannes Sixt <j6t@xxxxxxxx>
> ---
> Am 9/2/2013 13:56, schrieb Duy Nguyen:
>> On Mon, Sep 2, 2013 at 5:41 PM, Johannes Sixt <j.sixt@xxxxxxxxxxxxx> wrote:
>>> Which features do we lose on Windows with the previous patch and this fixup?
>>
>> New pathspec magic :(glob), :(literal) and :(icase). You can still use
>> them via --*-pathspecs or equivalent env variables. You just can't
>> enable them per individual pathspec.
>
> I think this here is the correct "solution" rather than the special cases
> for Windows that you proposed. ActiveState perl users would still suffer,
> but that is a problem of the run_cmd_pipe implementation, which would
> need a smarter method to quote the arguments before it feeds them to qx{}.
I admit this is cleaner than my patch. Let's see any users using
ActiveState Perl yell up, then we'll deal with the problem.
> git-add--interactive.perl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-add--interactive.perl b/git-add--interactive.perl
> index 75a991f..5156384 100755
> --- a/git-add--interactive.perl
> +++ b/git-add--interactive.perl
> @@ -169,7 +169,7 @@ my %patch_modes = (
> my %patch_mode_flavour = %{$patch_modes{stage}};
>
> sub run_cmd_pipe {
> - if ($^O eq 'MSWin32' || $^O eq 'msys') {
> + if ($^O eq 'MSWin32') {
> my @invalid = grep {m/[":*]/} @_;
> die "$^O does not support: @invalid\n" if @invalid;
> my @args = map { m/ /o ? "\"$_\"": $_ } @_;
> --
> 1.8.4.1549.gc059550.dirty
>
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html