diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-04-12 16:46:40 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-04-12 16:46:40 -0700 |
commit | 6e353a5e5de9da021c7c6c0bc2dc5f95a39900a1 (patch) | |
tree | ad981695b0376a42123220d98f3cc4cc74c2ca4b /list-objects.c | |
parent | a54c4edc511608fdba513cc94812c31fd4b497f6 (diff) | |
parent | 13858e5770dd218e5318819d3273c916b46cf8e5 (diff) | |
download | git-6e353a5e5de9da021c7c6c0bc2dc5f95a39900a1.tar.gz |
Merge branch 'cc/bisect-filter'
* cc/bisect-filter: (21 commits)
rev-list: add "int bisect_show_flags" in "struct rev_list_info"
rev-list: remove last static vars used in "show_commit"
list-objects: add "void *data" parameter to show functions
bisect--helper: string output variables together with "&&"
rev-list: pass "int flags" as last argument of "show_bisect_vars"
t6030: test bisecting with paths
bisect: use "bisect--helper" and remove "filter_skipped" function
bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES"
bisect--helper: implement "git bisect--helper"
bisect: use the new generic "sha1_pos" function to lookup sha1
rev-list: call new "filter_skip" function
patch-ids: use the new generic "sha1_pos" function to lookup sha1
sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1
rev-list: pass "revs" to "show_bisect_vars"
rev-list: make "show_bisect_vars" non static
rev-list: move code to show bisect vars into its own function
rev-list: move bisect related code into its own file
rev-list: make "bisect_list" variable local to "cmd_rev_list"
refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions
quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array
...
Diffstat (limited to 'list-objects.c')
-rw-r--r-- | list-objects.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/list-objects.c b/list-objects.c index dd243c7c66..433394a107 100644 --- a/list-objects.c +++ b/list-objects.c @@ -135,8 +135,9 @@ void mark_edges_uninteresting(struct commit_list *list, } void traverse_commit_list(struct rev_info *revs, - void (*show_commit)(struct commit *), - void (*show_object)(struct object_array_entry *)) + show_commit_fn show_commit, + show_object_fn show_object, + void *data) { int i; struct commit *commit; @@ -144,7 +145,7 @@ void traverse_commit_list(struct rev_info *revs, while ((commit = get_revision(revs)) != NULL) { process_tree(revs, commit->tree, &objects, NULL, ""); - show_commit(commit); + show_commit(commit, data); } for (i = 0; i < revs->pending.nr; i++) { struct object_array_entry *pending = revs->pending.objects + i; @@ -171,7 +172,7 @@ void traverse_commit_list(struct rev_info *revs, sha1_to_hex(obj->sha1), name); } for (i = 0; i < objects.nr; i++) - show_object(&objects.objects[i]); + show_object(&objects.objects[i], data); free(objects.objects); if (revs->pending.nr) { free(revs->pending.objects); |