diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-05 16:10:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-06 01:08:34 -0800 |
| commit | 2b064697a5b0610254f52523ce5b70c81118da80 (patch) | |
| tree | 4b84bfcc341ed1764f599baf8203d842322a8ea3 /revision.c | |
| parent | 86ab4906a7c86719cae33b28dac1a4157d665867 (diff) | |
| download | git-2b064697a5b0610254f52523ce5b70c81118da80.tar.gz | |
revision traversal: retire BOUNDARY_SHOW
This removes the flag internally used by revision traversal to
decide which commits are indeed boundaries and renames it to
CHILD_SHOWN. builtin-bundle uses the symbol for its
verification, but I think the logic it uses it is wrong. The
flag is still useful but it is local to the git-bundle, so it is
renamed to PREREQ_MARK.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 5d137ea14a..2d27ccf70b 100644 --- a/revision.c +++ b/revision.c @@ -1285,17 +1285,21 @@ struct commit *get_revision(struct rev_info *revs) commit_list_insert(c, &l); revs->commits = l; revs->reverse = 0; + c = NULL; } /* * Now pick up what they want to give us */ - c = get_revision_1(revs); + if (!(c = get_revision_1(revs))) + return NULL; while (0 < revs->skip_count) { revs->skip_count--; c = get_revision_1(revs); if (!c) break; + /* Although we grabbed it, it is not shown. */ + c->object.flags &= ~SHOWN; } /* @@ -1305,6 +1309,9 @@ struct commit *get_revision(struct rev_info *revs) case -1: break; case 0: + /* Although we grabbed it, it is not shown. */ + if (c) + c->object.flags &= ~SHOWN; c = NULL; break; default: |