Merge branch 'rs/path-name-safety-cleanup' into maint

diff --git a/revision.h b/revision.h
index 9fac1a607de6470ab0c9b7e5079e8d36c8d68c75..14886ec92b4f67527a86fc821998214a4d2b321f 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -259,8 +259,6 @@ extern void put_revision_mark(const struct rev_info *revs,
 extern void mark_parents_uninteresting(struct commit *commit);
 extern void mark_tree_uninteresting(struct tree *tree);
 
-char *path_name(struct strbuf *path, const char *name);
-
 extern void show_object_with_name(FILE *, struct object *, const char *);
 
 extern void add_pending_object(struct rev_info *revs,