Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 0e2f219b2b4d9ff5944e68dbaf2338c76055161f..15675701fd64d53cff9c27505cac6f4f14b1341d 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -625,7 +625,7 @@ int is_directory(const char *);
 const char *make_absolute_path(const char *path);
 const char *make_nonrelative_path(const char *path);
 const char *make_relative_path(const char *abs, const char *base);
-int normalize_absolute_path(char *buf, const char *path);
+int normalize_path_copy(char *dst, const char *src);
 int longest_ancestor_length(const char *path, const char *prefix_list);
 
 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */