Merge branch 'ab/ambiguous-object-name'

[thirdparty/git.git] / revision.h

diff --git a/revision.h b/revision.h
index 3f66147bfd390abdd98de4f366014bdce88179c2..b9c2421687fef8e5e1d90cdcefa163165573d7ad 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -158,6 +158,7 @@ struct rev_info {
                        bisect:1,
                        ancestry_path:1,
                        first_parent_only:1,
+                       exclude_first_parent_only:1,
                        line_level_traverse:1,
                        tree_blobs_in_commit_order:1,
 
@@ -195,7 +196,8 @@ struct rev_info {
                        combine_merges:1,
                        combined_all_paths:1,
                        dense_combined_merges:1,
-                       first_parent_merges:1;
+                       first_parent_merges:1,
+                       remerge_diff:1;
 
        /* Format info */
        int             show_notes;
@@ -315,6 +317,9 @@ struct rev_info {
 
        /* misc. flags related to '--no-kept-objects' */
        unsigned keep_pack_cache_flags;
+
+       /* Location where temporary objects for remerge-diff are written. */
+       struct tmp_objdir *remerge_objdir;
 };
 
 int ref_excluded(struct string_list *, const char *path);
@@ -372,6 +377,7 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 #define REVARG_COMMITTISH 02
 int handle_revision_arg(const char *arg, struct rev_info *revs,
                        int flags, unsigned revarg_opt);
+void revision_opts_finish(struct rev_info *revs);
 
 /**
  * Reset the flags used by the revision walking api. You can use this to do
@@ -398,7 +404,7 @@ const char *get_revision_mark(const struct rev_info *revs,
 void put_revision_mark(const struct rev_info *revs,
                       const struct commit *commit);
 
-void mark_parents_uninteresting(struct commit *commit);
+void mark_parents_uninteresting(struct rev_info *revs, struct commit *commit);
 void mark_tree_uninteresting(struct repository *r, struct tree *tree);
 void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees);