Merge branch 'jx/clean-interactive'

diff --git a/cache.h b/cache.h
index 3142b6c372361e93d1d16ce080f68aaf0bb51267..4c606ce28bcd59956a47b2881436047bc7a5ed90 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -760,7 +760,7 @@ 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 *relative_path(const char *abs, const char *base);
+const char *relative_path(const char *in, const char *prefix, struct strbuf *sb);
 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);