revision: forbid combining --graph and --no-walk

diff --git a/revision.h b/revision.h
index a6205307cf3bb2364b8642b0a4857c5b0ae9b5a9..033a24460e71b723f95ef91f4b6f0dbfd8c2c390 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -93,6 +93,7 @@ struct rev_info {
                        blob_objects:1,
                        verify_objects:1,
                        edge_hint:1,
+                       edge_hint_aggressive:1,
                        limited:1,
                        unpacked:1,
                        boundary:2,
@@ -264,11 +265,6 @@ 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,
@@ -276,6 +272,8 @@ extern void add_pending_sha1(struct rev_info *revs,
                             unsigned int flags);
 
 extern void add_head_to_pending(struct rev_info *);
+extern void add_reflogs_to_pending(struct rev_info *, unsigned int flags);
+extern void add_index_objects_to_pending(struct rev_info *, unsigned int flags);
 
 enum commit_action {
        commit_ignore,