more D/F conflict tests

diff --git a/list-objects.c b/list-objects.c
index 30ded3d4dd9d41432eba317ccc8765746b7d5c95..8953548c07bb36f20798c7ca344d07960c22618c 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -141,14 +141,15 @@ static void add_pending_tree(struct rev_info *revs, struct tree *tree)
 
 void traverse_commit_list(struct rev_info *revs,
                          show_commit_fn show_commit,
-                         show_object_fn show_object)
+                         show_object_fn show_object,
+                         void *data)
 {
        int i;
        struct commit *commit;
 
        while ((commit = get_revision(revs)) != NULL) {
                add_pending_tree(revs, commit->tree);
-               show_commit(commit);
+               show_commit(commit, data);
        }
        for (i = 0; i < revs->pending.nr; i++) {
                struct object_array_entry *pending = revs->pending.objects + i;