diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:45:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:45:06 -0700 |
| commit | ac4d29550f94ff793630deb82488c0b717dea859 (patch) | |
| tree | 51e3d30a78572f03e9808c91cbd9d84a2028ce6d | |
| parent | 34022ba21af3ec7d44b34a94cb8f2b3879c6c95c (diff) | |
| parent | df17e77c0aacca35eaaac885fe70d97654c07d62 (diff) | |
| download | git-ac4d29550f94ff793630deb82488c0b717dea859.tar.gz | |
Merge branch 'js/add-i-mingw'
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
| -rwxr-xr-x | git-add--interactive.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 75a991f7ec..51563840f4 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 ? "\"$_\"": $_ } @_; |