From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Lars Schneider <larsxschneider@gmail.com>,
Johannes Sixt <j6t@kdbg.org>,
Kazutoshi SATODA <k_satoda@f2.dion.ne.jp>,
Eric Wong <normalperson@yhbt.net>
Subject: Re: [PATCH 1/4] config --show-origin: report paths with forward slashes
Date: Wed, 23 Mar 2016 09:20:27 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1603230821420.4690@virtualbox> (raw)
In-Reply-To: <xmqqbn66iedh.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Tue, 22 Mar 2016, Junio C Hamano wrote:
> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>
> > On Windows, the backslash is the native directory separator, but
> > all supported Windows versions also accept the forward slash in
> > most circumstances.
> >
> > Our tests expect forward slashes.
> >
> > Relative paths are generated by Git using forward slashes.
>
> ... and the paths tracked by Git (in the index) use slashes.
>
> > So let's try to be consistent and use forward slashes in the $HOME
> > part of the paths reported by `git config --show-origin`, too.
>
> OK, sounds sensible.
>
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> > compat/mingw.h | 6 ++++++
> > path.c | 3 +++
> > 2 files changed, 9 insertions(+)
> >
> > diff --git a/compat/mingw.h b/compat/mingw.h
> > index 8c5bf50..c008694 100644
> > --- a/compat/mingw.h
> > +++ b/compat/mingw.h
> > @@ -396,6 +396,12 @@ static inline char *mingw_find_last_dir_sep(const char *path)
> > ret = (char *)path;
> > return ret;
> > }
> > +static inline void convert_slashes(char *path)
> > +{
> > + for (; *path; path++)
> > + if (*path == '\\')
> > + *path = '/';
> > +}
> > #define find_last_dir_sep mingw_find_last_dir_sep
> > int mingw_offset_1st_component(const char *path);
> > #define offset_1st_component mingw_offset_1st_component
> > diff --git a/path.c b/path.c
> > index 8b7e168..969b494 100644
> > --- a/path.c
> > +++ b/path.c
> > @@ -584,6 +584,9 @@ char *expand_user_path(const char *path)
> > if (!home)
> > goto return_null;
> > strbuf_addstr(&user_path, home);
> > +#ifdef GIT_WINDOWS_NATIVE
> > + convert_slashes(user_path.buf);
> > +#endif
>
> Hmm, I wonder if we want to do this at a bit lower level,
Well, I tried to be careful. There *are* circumstamces when backslashes
are required (CreateProcess() comes to mind), so I wanted to have this
conversion as much only in the user-visible output as possible.
> e.g.
>
> 1. have a fallback for other platforms in git-compat-util.h
>
> #ifndef get_HOME
> #define get_HOME() getenv("HOME")
> #endif
Once upon a time, I had something like that (without the ugly uppercase,
to account for the fact that Windows has no single HOME setting):
http://thread.gmane.org/gmane.comp.version-control.msysgit/20339
> 2. have the one that does convert-slashes for mingw
>
> static inline const char *mingw_getenv_HOME(void) {
> ... do convert-slashes on the result of getenv("HOME");
> }
> #define get_HOME() mingw_getenv_HOME()
We could do that much easier now:
-- snip --
diff --git a/compat/mingw.c b/compat/mingw.c
index 54c82ec..96022b7 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2117,6 +2117,12 @@ static void setup_windows_environment()
*tmp = '/';
}
+ tmp = getenv("HOME");
+ if (tmp)
+ for (; *tmp; tmp++)
+ if (*tmp == '\\')
+ *tmp = '/';
+
/* simulate TERM to enable auto-color (see color.c) */
if (!getenv("TERM"))
setenv("TERM", "cygwin", 1);
-- snap --
But again, I am uncomfortable to do this wholesale without having the time
to do anything quickly about unintended side effects.
> 3. Instead of the above patch to path.c, change the line before
> the precontext with s/getenv("HOME")/get_HOME()/
>
> Or even lower, inside mingw_getenv() and catch variables that deal
> with paths (not just HOME but PATH, TMP, TMPDIR, etc.)
That outright scares me. Don't do that.
:-)
Again, just to make sure my point is heard: there *are* circumstances when
the Win32 API expects backslashes and cannot handle forward ones. I would
not dare to claim to be an expert in that matter, so I would rather want
to err on the side of converting backslashes to forward slashes *only*
when really needed.
Ciao,
Dscho
next prev parent reply other threads:[~2016-03-23 8:20 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-22 17:42 [PATCH 0/4] Git for Windows fixes in preparation for 2.8.0 Johannes Schindelin
2016-03-22 17:42 ` [PATCH 1/4] config --show-origin: report paths with forward slashes Johannes Schindelin
2016-03-22 17:58 ` Junio C Hamano
2016-03-23 8:20 ` Johannes Schindelin [this message]
2016-03-23 16:34 ` Junio C Hamano
2016-03-28 7:58 ` Johannes Sixt
2016-03-28 15:14 ` Johannes Schindelin
2016-03-29 19:18 ` Johannes Sixt
2016-03-29 20:05 ` Junio C Hamano
2016-04-02 19:03 ` Johannes Sixt
2016-04-04 15:51 ` Junio C Hamano
2016-04-04 20:42 ` Johannes Schindelin
2016-03-30 5:52 ` Johannes Sixt
2016-04-02 18:51 ` Johannes Sixt
2016-03-22 17:42 ` [PATCH 2/4] Make t1300-repo-config resilient to being run via 'sh -x' Johannes Schindelin
2016-03-22 17:59 ` Jonathan Nieder
2016-03-22 20:34 ` Junio C Hamano
2016-03-22 23:45 ` Jonathan Nieder
2016-03-23 7:21 ` Johannes Schindelin
2016-03-22 18:01 ` Junio C Hamano
2016-03-23 8:22 ` Johannes Schindelin
2016-03-22 17:42 ` [PATCH 3/4] t1300: fix the new --show-origin tests on Windows Johannes Schindelin
2016-03-22 18:13 ` Junio C Hamano
2016-03-23 10:42 ` Johannes Schindelin
2016-03-22 17:43 ` [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues Johannes Schindelin
2016-03-22 18:03 ` Jonathan Nieder
2016-03-22 18:30 ` Torsten Bögershausen
2016-03-22 20:44 ` Junio C Hamano
2016-03-22 22:44 ` Torsten Bögershausen
2016-03-22 22:57 ` Junio C Hamano
2016-03-23 5:54 ` Torsten Bögershausen
2016-03-23 10:49 ` Johannes Schindelin
2016-03-23 15:56 ` Junio C Hamano
2016-03-23 19:08 ` Torsten Bögershausen
2016-03-23 22:44 ` Torsten Bögershausen
2016-03-22 17:50 ` [PATCH 0/4] Git for Windows fixes in preparation for 2.8.0 Junio C Hamano
2016-03-23 10:54 ` [PATCH v2 " Johannes Schindelin
2016-03-23 10:55 ` [PATCH v2 1/4] config --show-origin: report paths with forward slashes Johannes Schindelin
2016-03-23 10:55 ` [PATCH v2 2/4] Make t1300-repo-config resilient to being run via 'sh -x' Johannes Schindelin
2016-03-23 10:55 ` [PATCH v2 3/4] t1300: fix the new --show-origin tests on Windows Johannes Schindelin
2016-03-23 11:08 ` Lars Schneider
2016-03-23 10:55 ` [PATCH v2 4/4] mingw: skip some tests in t9115 due to file name issues Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1603230821420.4690@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=k_satoda@f2.dion.ne.jp \
--cc=larsxschneider@gmail.com \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).