From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Oct 2013 17:42:29 +0000 (-0700)
Subject: Merge branch 'jx/relative-path-regression-fix'
X-Git-Tag: v1.8.5-rc0~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e22c1c7f19914aa0dc1b6fe65bbfafed265d6e7f;p=thirdparty%2Fgit.git

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
---

e22c1c7f19914aa0dc1b6fe65bbfafed265d6e7f
diff --cc cache.h
index 5e3fc72fd4,94475bd9ee..70ad174dd9
--- a/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);