diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2009-06-06 04:41:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-06 18:26:56 (GMT) |
| commit | 9af3589e0e42eb289dfdb8bb4031e5bec4923308 (patch) | |
| tree | 84f82922eb53f65de7c6a1bf0f05ba806e7ceeb9 /builtin-rev-list.c | |
| parent | e22278c0a0784d4285f0e3173794caad4e542658 (diff) | |
| download | git-9af3589e0e42eb289dfdb8bb4031e5bec4923308.zip git-9af3589e0e42eb289dfdb8bb4031e5bec4923308.tar.gz git-9af3589e0e42eb289dfdb8bb4031e5bec4923308.tar.bz2 | |
bisect: add parameters to "filter_skipped"
because we will need to get more information from this function in
some later patches.
The new "int *count" parameter gives the number of commits left after
the skipped commit have been filtered out.
The new "int *skipped_first" parameter tells us if the first commit
in the list has been skipped. Note that using this parameter also
changes the behavior of the function if the first commit is indeed
skipped. Because we assume that in this case we will want all the
filtered commits, not just the first one, even if "show_all" is not
set.
So using a not NULL "skipped_first" parameter really means that we
plan to choose to test another commit than the first non skipped
one if the first commit in the list is skipped. That in turn means
that, in case the first commit is skipped, we have to return a
fully filtered list.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-rev-list.c')
| -rw-r--r-- | builtin-rev-list.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-rev-list.c b/builtin-rev-list.c index 31ea5f4..4ba1c12 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -262,7 +262,9 @@ int show_bisect_vars(struct rev_list_info *info, int reaches, int all) if (!revs->commits && !(flags & BISECT_SHOW_TRIED)) return 1; - revs->commits = filter_skipped(revs->commits, &tried, flags & BISECT_SHOW_ALL); + revs->commits = filter_skipped(revs->commits, &tried, + flags & BISECT_SHOW_ALL, + NULL, NULL); /* * revs->commits can reach "reaches" commits among |