Merge branch 'jc/xstrfmt-null-with-prec-0' into maint

diff --git a/revision.h b/revision.h
index 23857c0ed1d7a304c848842711a920e678fd506d..dca0d381715cf5bc6888587feaec989012f51252 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -257,16 +257,9 @@ 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);
 
-struct name_path {
-       struct name_path *up;
-       int elem_len;
-       const char *elem;
-};
-
-char *path_name(const struct name_path *path, const char *name);
+char *path_name(struct strbuf *path, const char *name);
 
-extern void show_object_with_name(FILE *, struct object *,
-                                 const struct name_path *, const char *);
+extern void show_object_with_name(FILE *, struct object *, const char *);
 
 extern void add_pending_object(struct rev_info *revs,
                               struct object *obj, const char *name);