Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8

[git.git] / revision.h

diff --git a/revision.h b/revision.h
index 93d31556cb44d3e4c5162d21c8e92d572a36508e..6aa53d1aa708918e4bbbebb042e0bf75c1629b05 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -73,6 +73,7 @@ struct rev_info {
                        tag_objects:1,
                        tree_objects:1,
                        blob_objects:1,
+                       verify_objects:1,
                        edge_hint:1,
                        limited:1,
                        unpacked:1,
@@ -117,6 +118,7 @@ struct rev_info {
                        date_mode_explicit:1,
                        preserve_subject:1;
        unsigned int    disable_stdin:1;
+       unsigned int    leak_pending:1;
 
        enum date_mode date_mode;
 
@@ -205,12 +207,15 @@ struct name_path {
 
 char *path_name(const struct name_path *path, const char *name);
 
+extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *);
+
 extern void add_object(struct object *obj,
                       struct object_array *p,
                       struct name_path *path,
                       const char *name);
 
 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
+extern void add_pending_sha1(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags);
 
 extern void add_head_to_pending(struct rev_info *);