Merge branch 'rj/remove-unused-mktemp' into maint

diff --git a/cache.h b/cache.h
index a575684a98454925b21590f17258f15d95ae8f0f..8a9069dc9fa76f39d236e3c2137fc53285c18ee1 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1106,7 +1106,7 @@ 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);
+char *real_pathdup(const char *path, int die_on_error);
 const char *absolute_path(const char *path);
 char *absolute_pathdup(const char *path);
 const char *remove_leading_path(const char *in, const char *prefix);