From: Junio C Hamano <gitster@pobox•com>
To: kusmabite@gmail•com
Cc: Johannes Sixt <j.sixt@viscovery•net>,
GIT Mailing-list <git@vger•kernel.org>,
msysGit <msysgit@googlegroups•com>,
Johannes Schindelin <johannes.schindelin@gmx•de>
Subject: Re* [PATCH] send-email: recognize absolute path on Windows
Date: Tue, 15 Apr 2014 09:57:21 -0700 [thread overview]
Message-ID: <xmqq61maledq.fsf_-_@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CABPQNSafmC-7zNJZJSZm598pF37_xUMUopgZ3c=ttL_wRDYsfQ@mail.gmail.com> (Erik Faye-Lund's message of "Tue, 15 Apr 2014 12:42:15 +0200")
Erik Faye-Lund <kusmabite@gmail•com> 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@googlemail•com>
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@gmail•com>
Helepd-by: Johannes Sixt <j6t@kdbg•org>
---
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) {
--
--
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.
You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to msysgit@googlegroups•com
To unsubscribe from this group, send email to
msysgit+unsubscribe@googlegroups•com
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
---
You received this message because you are subscribed to the Google Groups "msysGit" group.
To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups•com.
For more options, visit https://groups.google.com/d/optout.
next prev parent reply other threads:[~2014-04-15 16:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-15 8:44 [PATCH] send-email: recognize absolute path on Windows Erik Faye-Lund
2014-04-15 10:32 ` Johannes Sixt
2014-04-15 10:42 ` Erik Faye-Lund
2014-04-15 16:57 ` Junio C Hamano [this message]
2014-04-15 20:37 ` Re* " Junio C Hamano
2014-04-15 20:49 ` Erik Faye-Lund
2014-04-15 21:06 ` Junio C Hamano
2014-04-15 20:28 ` Erik Faye-Lund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq61maledq.fsf_-_@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=j.sixt@viscovery$(echo .)net \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=kusmabite@gmail$(echo .)com \
--cc=msysgit@googlegroups$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox