From bce6286670c6735d0ca2fdf582047e0388dfcd84 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 6 Jul 2005 09:56:16 -0700
Subject: 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.
---
 rev-list.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'rev-list.c')

diff --git a/rev-list.c b/rev-list.c
index c20fec804e..e4d167c003 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -8,7 +8,8 @@
 #define SEEN		(1u << 0)
 #define INTERESTING	(1u << 1)
 #define COUNTED		(1u << 2)
-#define SHOWN		(LAST_EPOCH_FLAG << 2)
+#define SHOWN		(1u << 3)
+#define DUPCHECK	(1u << 4)
 
 static const char rev_list_usage[] =
 	"usage: git-rev-list [OPTION] commit-id <commit-id>\n"
@@ -485,6 +486,9 @@ int main(int argc, char **argv)
 		commit = get_commit_reference(arg, flags);
 		if (!commit)
 			continue;
+		if (commit->object.flags & DUPCHECK)
+			continue;
+		commit->object.flags |= DUPCHECK;
 		insert(commit, &list);
 	}
 
-- 
cgit v1.2.1