summaryrefslogtreecommitdiff
path: root/git-add--interactive.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-15 18:59:45 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-15 18:59:45 -0700
commit223bb84572c8b2058e175e8452913bcb1bdb0ade (patch)
treeec3704442ab81fdd9a1453878e0bd151dc019e62 /git-add--interactive.perl
parent1466080199c9e102515b8a0820d97eed86a8f678 (diff)
parentfdfd20080239c8564e40498bbaae63c1b87ccdba (diff)
downloadgit-223bb84572c8b2058e175e8452913bcb1bdb0ade.tar.gz
Merge branch 'sp/win'
* sp/win: We need to check for msys as well as Windows in add--interactive. Convert CR/LF to LF in tag signatures Fixed text file auto-detection: treat EOF character 032 at the end of file as printable
Diffstat (limited to 'git-add--interactive.perl')
-rwxr-xr-xgit-add--interactive.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index a6a5c52b59..da768ee7ac 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -54,7 +54,7 @@ sub colored {
my $patch_mode;
sub run_cmd_pipe {
- if ($^O eq 'MSWin32') {
+ if ($^O eq 'MSWin32' || $^O eq 'msys') {
my @invalid = grep {m/[":*]/} @_;
die "$^O does not support: @invalid\n" if @invalid;
my @args = map { m/ /o ? "\"$_\"": $_ } @_;