{"thread":{"id":"18526","subject":"[PATCH] difftool: use perl built-ins when testing for msys","startedAt":"2009-03-25T06:13:53Z","lastAt":"2009-03-25T06:13:53Z","messageCount":1,"participants":["David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"109316","messageId":"1237961633-29082-1-git-send-email-davvid@gmail.com","threadId":"18526","inReplyTo":null,"subject":"[PATCH] difftool: use perl built-ins when testing for msys","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-03-25T06:13:53Z","receivedAt":"2009-03-25T06:13:53Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"I don't even know what $COMSPEC means so let's be safe and use the\nsame perly $^O test add--interactive uses.  While we're at it, make\ngit-difftool match the prevalent git-perl style.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n git-difftool.perl |    7 +++++--\n 1 files changed, 5 insertions(+), 2 deletions(-)\n\ndiff --git a/git-difftool.perl b/git-difftool.perl\nindex 0deda3a..207dd50 100755\n--- a/git-difftool.perl\n+++ b/git-difftool.perl\n@@ -33,7 +33,10 @@ sub setup_environment\n sub exe\n {\n \tmy $exe = shift;\n-\treturn defined $ENV{COMSPEC} ? \"$exe.exe\" : $exe;\n+\tif ($^O eq 'MSWin32' || $^O eq 'msys') {\n+\t\treturn \"$exe.exe\";\n+\t}\n+\treturn $exe;\n }\n \n sub generate_command\n@@ -47,7 +50,7 @@ sub generate_command\n \t\t\t$skip_next = 0;\n \t\t\tnext;\n \t\t}\n-\t\tif ($arg eq '-t' or $arg eq '--tool') {\n+\t\tif ($arg eq '-t' || $arg eq '--tool') {\n \t\t\tusage() if $#ARGV <= $idx;\n \t\t\t$ENV{GIT_DIFF_TOOL} = $ARGV[$idx + 1];\n \t\t\t$skip_next = 1;\n-- \n1.6.2.1.303.g63699\n"}]}