Erik Faye-Lund <kusmabite@xxxxxxxxx> writes:
>>> Here's a patch that we've been running with a variation of in
>>> Git for Windows for a while. That version wasn't quite palatable,
>>> as it recognized DOS drive-prefixes on all platforms.
>>
>> Did you consider patching msysgit's lib/perl5/5.8.8/File/Spec.pm by
>> inserting a line "msys => 'Win32'," near the top of the file; it is the
>> hash table that decides which path "style" is selected depending on $^O.
>> Then File::Spec->file_name_is_absolute($path) could be used without a wrapper.
>
> I did not, but that works, and is IMO much nicer. Thanks for the idea!
> ...
>> There's another instance in the non-$quiet code path around line 1275 that
>> needs the same treatment.
>
> Good catch, thanks!
Thanks, both. I'd expect another round then?
-- >8 --
From: Erik Faye-Lund <kusmabite@xxxxxxxxxxxxxx>
On Windows, absolute paths might start with a DOS drive prefix,
which these checks fail to recognize.
Use file_name_is_absolute from File::Spec::Functions for
portability. The Perl module msysgit has been shipping needs to be
updated for this patch to work, though.
Signed-off-by: Erik Faye-Lund <kusmabite@xxxxxxxxx>
Helepd-by: Johannes Sixt <j6t@xxxxxxxx>
---
git-send-email.perl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index fdb0029..eda3917 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -25,7 +25,7 @@
use Data::Dumper;
use Term::ANSIColor;
use File::Temp qw/ tempdir tempfile /;
-use File::Spec::Functions qw(catfile);
+use File::Spec::Functions qw(catfile file_name_is_absolute);
use Error qw(:try);
use Git;
@@ -1197,7 +1197,7 @@ sub send_message {
if ($dry_run) {
# We don't want to send the email.
- } elsif ($smtp_server =~ m#^/#) {
+ } elsif (file_name_is_absolute($smtp_server)) {
my $pid = open my $sm, '|-';
defined $pid or die $!;
if (!$pid) {
@@ -1271,7 +1271,7 @@ sub send_message {
printf (($dry_run ? "Dry-" : "")."Sent %s\n", $subject);
} else {
print (($dry_run ? "Dry-" : "")."OK. Log says:\n");
- if ($smtp_server !~ m#^/#) {
+ if (file_name_is_absolute($smtp_server)) {
print "Server: $smtp_server\n";
print "MAIL FROM:<$raw_from>\n";
foreach my $entry (@recipients) {
--
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