Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'

diff --git a/path.c b/path.c
index 8b7e16812927645367c4912e88d2a5f3065efb85..969b494d72dff1439150e7bb945339be07c4d475 100644 (file)
--- 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)