Merge branch 'rs/absolute-pathdup'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Feb 2017 21:36:55 +0000 (13:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Feb 2017 21:36:55 +0000 (13:36 -0800)
Code cleanup.

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

1  2 
abspath.c
builtin/clone.c
builtin/submodule--helper.c
cache.h
worktree.c

diff --cc abspath.c
Simple merge
diff --cc builtin/clone.c
Simple merge
Simple merge
diff --cc 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);
diff --cc worktree.c
Simple merge