Merge branch 'mg/rev-list-one-side-only'
* mg/rev-list-one-side-only: git-log: put space after commit mark t6007: test rev-list --cherry log --cherry: a synonym rev-list: documentation and test for --cherry-mark revision.c: introduce --cherry-mark rev-list/log: factor out revision mark generation rev-list: --left/right-only are mutually exclusive rev-list: documentation and test for --left/right-only t6007: Make sure we test --cherry-pick revlist.c: introduce --left/right-only for unsymmetric picking
This commit is contained in:
@ -14,7 +14,8 @@
|
||||
#define CHILD_SHOWN (1u<<6)
|
||||
#define ADDED (1u<<7) /* Parents already parsed and added? */
|
||||
#define SYMMETRIC_LEFT (1u<<8)
|
||||
#define ALL_REV_FLAGS ((1u<<9)-1)
|
||||
#define PATCHSAME (1u<<9)
|
||||
#define ALL_REV_FLAGS ((1u<<10)-1)
|
||||
|
||||
#define DECORATE_SHORT_REFS 1
|
||||
#define DECORATE_FULL_REFS 2
|
||||
@ -59,6 +60,8 @@ struct rev_info {
|
||||
boundary:2,
|
||||
count:1,
|
||||
left_right:1,
|
||||
left_only:1,
|
||||
right_only:1,
|
||||
rewrite_parents:1,
|
||||
print_parents:1,
|
||||
show_source:1,
|
||||
@ -66,6 +69,7 @@ struct rev_info {
|
||||
reverse:1,
|
||||
reverse_output_stage:1,
|
||||
cherry_pick:1,
|
||||
cherry_mark:1,
|
||||
bisect:1,
|
||||
ancestry_path:1,
|
||||
first_parent_only:1;
|
||||
@ -163,6 +167,8 @@ extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,
|
||||
|
||||
extern int prepare_revision_walk(struct rev_info *revs);
|
||||
extern struct commit *get_revision(struct rev_info *revs);
|
||||
extern char *get_revision_mark(const struct rev_info *revs, const struct commit *commit);
|
||||
extern void put_revision_mark(const struct rev_info *revs, const struct commit *commit);
|
||||
|
||||
extern void mark_parents_uninteresting(struct commit *commit);
|
||||
extern void mark_tree_uninteresting(struct tree *tree);
|
||||
|
Reference in New Issue
Block a user