[PATCH 5/6] list-objects: reduce one argument in mark_edges_uninteresting
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Aug 16, 2013, 09:52 UTC
- Message-ID
- <1376646727-22318-5-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1376646727-22318-1-git-send-email-pclouds@gmail.com>
mark_edges_uninteresting() is always called with this form
mark_edges_uninteresting(revs->commits, revs, ...);
Remove the first argument and let mark_edges_uninteresting figure that out by itself. It helps answer the question "are this commit list and revs related in any way?" when looking at mark_edges_uninteresting implementation.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- bisect.c | 2 +- builtin/pack-objects.c | 2 +- builtin/rev-list.c | 2 +- http-push.c | 2 +- list-objects.c | 7 +++---- list-objects.h | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/bisect.c b/bisect.c index 71c1958..1e46a4f 100644 --- a/bisect.c +++ b/bisect.c @@ -624,7 +624,7 @@ static void bisect_common(struct rev_info *revs) if (prepare_revision_walk(revs)) die("revision walk setup failed"); if (revs->tree_objects) - mark_edges_uninteresting(revs->commits, revs, NULL); + mark_edges_uninteresting(revs, NULL); } static void exit_if_skipped_commits(struct commit_list *tried, diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index f069462..dd117b3 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2378,7 +2378,7 @@ static void get_object_list(int ac, const char **av) if (prepare_revision_walk(&revs)) die("revision walk setup failed"); - mark_edges_uninteresting(revs.commits, &revs, show_edge); + mark_edges_uninteresting(&revs, show_edge); traverse_commit_list(&revs, show_commit, show_object, NULL); if (keep_unreachable) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index a5ec30d..4fc1616 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -336,7 +336,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) if (prepare_revision_walk(&revs)) die("revision walk setup failed"); if (revs.tree_objects) - mark_edges_uninteresting(revs.commits, &revs, show_edge); + mark_edges_uninteresting(&revs, show_edge); if (bisect_list) { int reaches = reaches, all = all; diff --git a/http-push.c b/http-push.c index 6dad188..cde6416 100644 --- a/http-push.c +++ b/http-push.c @@ -1976,7 +1976,7 @@ int main(int argc, char **argv) pushing = 0; if (prepare_revision_walk(&revs)) die("revision walk setup failed"); - mark_edges_uninteresting(revs.commits, &revs, NULL); + mark_edges_uninteresting(&revs, NULL); objects_to_send = get_delta(&revs, ref_lock); finish_all_active_slots(); diff --git a/list-objects.c b/list-objects.c index 3dd4a96..db8ee4f 100644 --- a/list-objects.c +++ b/list-objects.c @@ -145,11 +145,10 @@ static void mark_edge_parents_uninteresting(struct commit *commit, } } -void mark_edges_uninteresting(struct commit_list *list, - struct rev_info *revs, - show_edge_fn show_edge) +void mark_edges_uninteresting(struct rev_info *revs, show_edge_fn show_edge) { - for ( ; list; list = list->next) { + struct commit_list *list; + for (list = revs->commits; list; list = list->next) { struct commit *commit = list->item; if (commit->object.flags & UNINTERESTING) { diff --git a/list-objects.h b/list-objects.h index 3db7bb6..136a1da 100644 --- a/list-objects.h +++ b/list-objects.h @@ -6,6 +6,6 @@ typedef void (*show_object_fn)(struct object *, const struct name_path *, const void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *); typedef void (*show_edge_fn)(struct commit *); -void mark_edges_uninteresting(struct commit_list *, struct rev_info *, show_edge_fn); +void mark_edges_uninteresting(struct rev_info *, show_edge_fn); #endif
-- 1.8.2.82.gc24b958