worktree.c: add is_worktree_locked()

diff --git a/revision.h b/revision.h
index 6cc36b49c59cc2265040eaa033e4f0e5c607ea48..9fac1a607de6470ab0c9b7e5079e8d36c8d68c75 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -259,16 +259,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);