Sync with maint to grab trivial doc fixes

diff --git a/abspath.c b/abspath.c
index f8a526f3916d753addac6acce1986cd3079472b8..64adbe2a1b5e5679fb0dc772452b4aca1865ee4c 100644 (file)
--- a/abspath.c
+++ b/abspath.c
@@ -153,6 +153,11 @@ const char *real_path(const char *path)
        return real_path_internal(path, 1);
 }
 
+const char *real_path_if_valid(const char *path)
+{
+       return real_path_internal(path, 0);
+}
+
 static const char *get_pwd_cwd(void)
 {
        static char cwd[PATH_MAX + 1];
@@ -211,7 +216,7 @@ const char *absolute_path(const char *path)
 const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
 {
        static char path[PATH_MAX];
-#ifndef WIN32
+#ifndef GIT_WINDOWS_NATIVE
        if (!pfx_len || is_absolute_path(arg))
                return arg;
        memcpy(path, pfx, pfx_len);