diff --git a/revision.h b/revision.h
index 6579a446ea8bfc7a3e8b0f19a39013458c6b537b..2845167746ce4632894fce88e840df60513933aa 100644 (file)
--- a/revision.h
+++ b/revision.h
#define SHOWN (1u<<3)
#define TMP_MARK (1u<<4) /* for isolated cases; clean after use */
#define BOUNDARY (1u<<5)
-#define BOUNDARY_SHOW (1u<<6)
+#define CHILD_SHOWN (1u<<6)
#define ADDED (1u<<7) /* Parents already parsed and added? */
#define SYMMETRIC_LEFT (1u<<8)
-#define CHILD_SHOWN (1u<<9)
struct rev_info;
struct log_info;
boundary:2,
left_right:1,
parents:1,
- reverse:1;
+ reverse:1,
+ cherry_pick:1,
+ first_parent_only:1;
/* Diff flags */
unsigned int diff:1,
/* Format info */
unsigned int shown_one:1,
- abbrev_commit:1,
- relative_date:1;
+ abbrev_commit:1;
+ enum date_mode date_mode;
const char **ignore_packed; /* pretend objects in these are unpacked */
int num_ignore_packed;
const char *add_signoff;
const char *extra_headers;
const char *log_reencode;
+ const char *subject_prefix;
+ int no_inline;
/* Filter by commit log message */
struct grep_opt *grep_filter;
extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
-extern void prepare_revision_walk(struct rev_info *revs);
+extern int prepare_revision_walk(struct rev_info *revs);
extern struct commit *get_revision(struct rev_info *revs);
extern void mark_parents_uninteresting(struct commit *commit);
const char *name);
extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
+extern void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode);
#endif