git: update to v2.39.1

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 20774bf82fa5ce3f5450c33943af158308a7c2ce..311304ab80abd60fd957d5bf89a5d1a3d5e008d3 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -159,7 +159,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
                      "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 
                      "", &revs->diffopt);
        diffcore_std(&revs->diffopt);
 

-       found = !diff_queue_is_empty();
+       found = !diff_queue_is_empty(&revs->diffopt);

        saved_fmt = revs->diffopt.output_format;
        revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
        revs->diffopt.format_callback = cgit_diff_tree_cb;
        saved_fmt = revs->diffopt.output_format;
        revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
        revs->diffopt.format_callback = cgit_diff_tree_cb;


@@ -489,8 +489,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) {
                if (show_commit(commit, &rev))
                        i++;
        for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; /* nop */) {
                if (show_commit(commit, &rev))
                        i++;

-               free_commit_buffer(the_repository->parsed_objects, commit);
-               free_commit_list(commit->parents);
+               release_commit_memory(the_repository->parsed_objects, commit);

                commit->parents = NULL;
        }
 
                commit->parents = NULL;
        }
 


@@ -511,8 +510,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                        i++;
                        print_commit(commit, &rev);
                }
                        i++;
                        print_commit(commit, &rev);
                }

-               free_commit_buffer(the_repository->parsed_objects, commit);
-               free_commit_list(commit->parents);
+               release_commit_memory(the_repository->parsed_objects, commit);

                commit->parents = NULL;
        }
        if (pager) {
                commit->parents = NULL;
        }
        if (pager) {