diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 09:56:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 09:56:16 -0700 |
| commit | bce6286670c6735d0ca2fdf582047e0388dfcd84 (patch) | |
| tree | 67b236ad312d3f1fb972f506e6239a47e0a5d775 /rev-list.c | |
| parent | 7e21c29b56f80e8fd24613207b4e0116659ad5f8 (diff) | |
| download | git-bce6286670c6735d0ca2fdf582047e0388dfcd84.tar.gz git-bce6286670c6735d0ca2fdf582047e0388dfcd84.tar.xz | |
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 'rev-list.c')
| -rw-r--r-- | rev-list.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rev-list.c b/rev-list.c index c20fec804..e4d167c00 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); } |