aboutsummaryrefslogtreecommitdiff
path: root/epoch.h
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-06-20 12:29:38 +1000
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-19 20:13:18 -0700
commit51b1e1713b1ed8e962e994cd0850ea439ad8c3de (patch)
tree1887c012ec509096a8be45a5bc2c7ea43590eaf9 /epoch.h
parenteff19d5eccd02341a25f1543ff89fa7351163e3f (diff)
downloadgit-51b1e1713b1ed8e962e994cd0850ea439ad8c3de.tar.gz
git-51b1e1713b1ed8e962e994cd0850ea439ad8c3de.tar.xz
[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 <jon.seymour@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'epoch.h')
-rw-r--r--epoch.h13
1 files changed, 7 insertions, 6 deletions
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 */