Merge branch 'js/add-i-mingw'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:45:06 +0000 (11:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:45:06 +0000 (11:45 -0700)
The implementation of "add -i" has a crippling code to work around
ActiveState Perl limitation but it by mistake also triggered on Git
for Windows where MSYS perl is used.

* js/add-i-mingw:
add--interactive: fix external command invocation on Windows

git-add--interactive.perl
index 75a991f7ec8a2e4926cb925ad9ff23be2f6aedeb..51563840f49089cf250992fd47fe70a45cef0c52 100755 (executable)
@@ -169,7 +169,7 @@ sub colored {
 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 ? "\"$_\"": $_ } @_;