summaryrefslogtreecommitdiff
path: root/epoch.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 16:56:16 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 16:56:16 (GMT)
commitbce6286670c6735d0ca2fdf582047e0388dfcd84 (patch)
tree67b236ad312d3f1fb972f506e6239a47e0a5d775 /epoch.h
parent7e21c29b56f80e8fd24613207b4e0116659ad5f8 (diff)
downloadgit-bce6286670c6735d0ca2fdf582047e0388dfcd84.zip
git-bce6286670c6735d0ca2fdf582047e0388dfcd84.tar.gz
git-bce6286670c6735d0ca2fdf582047e0388dfcd84.tar.bz2
Remove insane overlapping bit ranges from epoch.c
..and move the DUPCHECK to rev-list.c since both the merge-order and the upcoming topo-sort get confused by dups.
Diffstat (limited to 'epoch.h')
-rw-r--r--epoch.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/epoch.h b/epoch.h
index 0c1385a..7493d5a 100644
--- a/epoch.h
+++ b/epoch.h
@@ -10,12 +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 LAST_EPOCH_FLAG (1u<<6)
+/* Low bits are used by rev-list */
+#define UNINTERESTING (1u<<10)
+#define BOUNDARY (1u<<11)
+#define VISITED (1u<<12)
+#define DISCONTINUITY (1u<<13)
+#define LAST_EPOCH_FLAG (1u<<14)
#endif /* EPOCH_H */