From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Feb 2017 21:36:55 +0000 (-0800)
Subject: Merge branch 'rs/absolute-pathdup'
X-Git-Tag: v2.12.0-rc0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f1c08bdb75b37ad30103f0f12339780fdc004e2;p=thirdparty%2Fgit.git

Merge branch 'rs/absolute-pathdup'

Code cleanup.

* rs/absolute-pathdup:
  use absolute_pathdup()
  abspath: add absolute_pathdup()
---

6f1c08bdb75b37ad30103f0f12339780fdc004e2
diff --cc cache.h
index 674ae7e662,f481e61f66..8c77b8c543
--- a/cache.h
+++ b/cache.h
@@@ -1095,12 -1030,10 +1095,13 @@@ static inline int is_absolute_path(cons
  	return is_dir_sep(path[0]) || has_dos_drive_prefix(path);
  }
  int is_directory(const char *);
 +char *strbuf_realpath(struct strbuf *resolved, const char *path,
 +		      int die_on_error);
  const char *real_path(const char *path);
  const char *real_path_if_valid(const char *path);
 +char *real_pathdup(const char *path);
  const char *absolute_path(const char *path);
+ char *absolute_pathdup(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);