diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-03-23 11:55:00 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-03-23 09:58:48 -0700 |
| commit | 5ca6b7bb47bddacac61e837d7692e1e8f5b24188 (patch) | |
| tree | 61ec32a0a1d799b10a5d3aa3964057760f1a4162 | |
| parent | Git 2.8-rc4 (diff) | |
| download | tgif-5ca6b7bb47bddacac61e837d7692e1e8f5b24188.tar.xz | |
config --show-origin: report paths with forward slashes
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.
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.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/mingw.h | 6 | ||||
| -rw-r--r-- | path.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 8c5bf5076b..c008694639 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 @@ -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 } else { struct passwd *pw = getpw_str(username, username_len); if (!pw) |