Skip to content

Commit

Permalink
list-objects: reduce one argument in mark_edges_uninteresting
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
pclouds authored and gitster committed Aug 28, 2013
1 parent cdab485 commit e76a5fb
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bisect.c
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion builtin/pack-objects.c
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion builtin/rev-list.c
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion http-push.c
Expand Up @@ -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();

Expand Down
7 changes: 3 additions & 4 deletions list-objects.c
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion list-objects.h
Expand Up @@ -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

0 comments on commit e76a5fb

Please sign in to comment.