diff options
author | Linus Torvalds <torvalds@osdl.org> | 2006-04-18 20:31:41 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-04-18 21:08:06 -0700 |
commit | 4262c1b0c38613a8c5ae729bd4d3f18f0df3ec44 (patch) | |
tree | 403c3c952087b26fb6923b78a73d980576c7d502 | |
parent | 24735cfc500feb2a8dba9f140080ab3476363d28 (diff) | |
download | git-4262c1b0c38613a8c5ae729bd4d3f18f0df3ec44.tar.gz |
Fix uninteresting tags in new revision parsing
When I unified the revision argument parsing, I introduced a simple bug
wrt tags that had been marked uninteresting. When it was preparing for the
revision walk, it would mark all the parent commits of an uninteresting
tag correctly uninteresting, but it would forget about the commit itself.
This means that when I just did my 2.6.17-rc2 release, and my scripts
generated the log for "v2.6.17-rc1..v2.6.17-rc2", everything was fine,
except the commit pointed to by 2.6.17-rc1 (which shouldn't have been
there) was included. Even though it should obviously have been marked as
being uninteresting.
Not a huge deal, and the fix is trivial.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r-- | revision.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.c b/revision.c index dbd54da5ba..113dd5a89f 100644 --- a/revision.c +++ b/revision.c @@ -152,6 +152,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object if (parse_commit(commit) < 0) die("unable to parse commit %s", name); if (flags & UNINTERESTING) { + commit->object.flags |= UNINTERESTING; mark_parents_uninteresting(commit); revs->limited = 1; } |