undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

list-objects: reduce one argument in mark_edges_uninteresting

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2013-08-16 16:52:06 +07:00 committed by Junio C Hamano
parent cdab485853
commit e76a5fb459
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bisect.c
View File

@ -624,7 +624,7 @@ static void bisect_common(struct rev_info *revs)
if (prepare_revision_walk(revs)) if (prepare_revision_walk(revs))
die("revision walk setup failed"); die("revision walk setup failed");
if (revs->tree_objects) 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, static void exit_if_skipped_commits(struct commit_list *tried,

2
builtin/pack-objects.c
View File

@ -2378,7 +2378,7 @@ static void get_object_list(int ac, const char **av)
if (prepare_revision_walk(&revs)) if (prepare_revision_walk(&revs))
die("revision walk setup failed"); 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); traverse_commit_list(&revs, show_commit, show_object, NULL);
if (keep_unreachable) if (keep_unreachable)

2
builtin/rev-list.c
View File

@ -336,7 +336,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if (prepare_revision_walk(&revs)) if (prepare_revision_walk(&revs))
die("revision walk setup failed"); die("revision walk setup failed");
if (revs.tree_objects) if (revs.tree_objects)
mark_edges_uninteresting(revs.commits, &revs, show_edge); mark_edges_uninteresting(&revs, show_edge);
if (bisect_list) { if (bisect_list) {
int reaches = reaches, all = all; int reaches = reaches, all = all;

2
http-push.c
View File

@ -1976,7 +1976,7 @@ int main(int argc, char **argv)
pushing = 0; pushing = 0;
if (prepare_revision_walk(&revs)) if (prepare_revision_walk(&revs))
die("revision walk setup failed"); 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); objects_to_send = get_delta(&revs, ref_lock);
finish_all_active_slots(); finish_all_active_slots();

7
list-objects.c
View File

@ -145,11 +145,10 @@ static void mark_edge_parents_uninteresting(struct commit *commit,
} }
} }
void mark_edges_uninteresting(struct commit_list *list, void mark_edges_uninteresting(struct rev_info *revs, show_edge_fn show_edge)
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; struct commit *commit = list->item;
if (commit->object.flags & UNINTERESTING) { if (commit->object.flags & UNINTERESTING) {

2
list-objects.h
View File

@ -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 *); void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
typedef void (*show_edge_fn)(struct commit *); 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 #endif