summaryrefslogtreecommitdiff
path: root/path.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-03-23 10:55:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-23 16:58:48 (GMT)
commit5ca6b7bb47bddacac61e837d7692e1e8f5b24188 (patch)
tree61ec32a0a1d799b10a5d3aa3964057760f1a4162 /path.c
parent808ecd4cca75acac5e4868f15d3e647fc73698d3 (diff)
downloadgit-5ca6b7bb47bddacac61e837d7692e1e8f5b24188.zip
git-5ca6b7bb47bddacac61e837d7692e1e8f5b24188.tar.gz
git-5ca6b7bb47bddacac61e837d7692e1e8f5b24188.tar.bz2
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>
Diffstat (limited to 'path.c')
-rw-r--r--path.c3
1 files changed, 3 insertions, 0 deletions
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
} else {
struct passwd *pw = getpw_str(username, username_len);
if (!pw)