diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 16:52:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-06 16:52:49 -0700 |
| commit | 960cea2dd108b425fdc4470b48f5eb02963a9be9 (patch) | |
| tree | 62224246361b63f68a7c1b3b72dcdb23ab2143a1 | |
| parent | e6c3505b44e943b73a01d9d48b442f8f49b0dfad (diff) | |
| download | git-960cea2dd108b425fdc4470b48f5eb02963a9be9.tar.gz git-960cea2dd108b425fdc4470b48f5eb02963a9be9.tar.xz | |
git-rev-list: remove the DUPCHECK logic, use SEEN instead
That's what we should have done in the first place, since it not only
avoids another unnecessary flag, it also protects the commits from
showing up as duplicates later when they show up as parents of another
commit (in the pop_most_recent_commit() path).
This will hopefully also fix --topo-sort.
| -rw-r--r-- | rev-list.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rev-list.c b/rev-list.c index fb3372476..0dd45129e 100644 --- a/rev-list.c +++ b/rev-list.c @@ -9,7 +9,6 @@ #define INTERESTING (1u << 1) #define COUNTED (1u << 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" @@ -488,9 +487,9 @@ int main(int argc, char **argv) commit = get_commit_reference(arg, flags); if (!commit) continue; - if (commit->object.flags & DUPCHECK) + if (commit->object.flags & SEEN) continue; - commit->object.flags |= DUPCHECK; + commit->object.flags |= SEEN; insert(commit, &list); } |