From 51b1e1713b1ed8e962e994cd0850ea439ad8c3de Mon Sep 17 00:00:00 2001 From: Jon Seymour Date: Mon, 20 Jun 2005 12:29:38 +1000 Subject: [PATCH] Prevent git-rev-list without --merge-order producing duplicates in output If b is reachable from a, then: git-rev-list a b argument would print one of the commits twice. This patch fixes that problem. A previous problem fixed it for the --merge-order switch. Signed-off-by: Jon Seymour Signed-off-by: Linus Torvalds --- epoch.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'epoch.h') diff --git a/epoch.h b/epoch.h index 585110bdd..0c1385a5d 100644 --- a/epoch.h +++ b/epoch.h @@ -10,11 +10,12 @@ typedef int (*emitter_func) (struct commit *); int sort_list_in_merge_order(struct commit_list *list, emitter_func emitter); -#define UNINTERESTING (1u<<2) -#define BOUNDARY (1u<<3) -#define VISITED (1u<<4) -#define DISCONTINUITY (1u<<5) -#define DUPCHECK (1u<<6) +#define UNINTERESTING (1u<<2) +#define BOUNDARY (1u<<3) +#define VISITED (1u<<4) +#define DISCONTINUITY (1u<<5) +#define DUPCHECK (1u<<6) +#define LAST_EPOCH_FLAG (1u<<6) -#endif /* EPOCH_H */ +#endif /* EPOCH_H */ -- cgit v1.2.1