Merge branch 'jx/relative-path-regression-fix'

* jx/relative-path-regression-fix:
  Use simpler relative_path when set_git_dir
  relative_path should honor dos-drive-prefix
  test: use unambigous leading path (/foo) for MSYS

diff --cc cache.h
index 5e3fc72fd40f49638c24c632121810468fb3acea,94475bd9eeda2edf86d005837d84d405e6836fe6..70ad174dd98c82503d246f8d9e5a253805e44076
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -751,8 -737,8 +751,9 @@@ int is_directory(const char *)
  const char *real_path(const char *path);
  const char *real_path_if_valid(const char *path);
  const char *absolute_path(const char *path);
+ const char *remove_leading_path(const char *in, const char *prefix);
  const char *relative_path(const char *in, const char *prefix, struct strbuf *sb);
 +int normalize_path_copy_len(char *dst, const char *src, int *prefix_len);
  int normalize_path_copy(char *dst, const char *src);
  int longest_ancestor_length(const char *path, struct string_list *prefixes);
  char *strip_path_suffix(const char *path, const char *suffix);

diff --cc path.c
Simple merge

diff --cc setup.c
Simple merge

diff --cc t/t0060-path-utils.sh
Simple merge