[PATCH 3/6] git: handle diff_queue_is_empty() changes

Vegard Nossum vegard.nossum at oracle.com
Mon Oct 17 11:50:07 UTC 2022


The newer git version this requires changes for these upstream commits:

* 95433eeed9eac439eb21eb30105354b15e71302e
  diff: add ability to insert additional headers for paths

Signed-off-by: Vegard Nossum <vegard.nossum at oracle.com>
---
 ui-log.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui-log.c b/ui-log.c
index 20774bf..4d7c48d 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -159,7 +159,8 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
 		      "", &revs->diffopt);
 	diffcore_std(&revs->diffopt);
 
-	found = !diff_queue_is_empty();
+	struct diff_options diffopt = { NULL };
+	found = !diff_queue_is_empty(&diffopt);
 	saved_fmt = revs->diffopt.output_format;
 	revs->diffopt.output_format = DIFF_FORMAT_CALLBACK;
 	revs->diffopt.format_callback = cgit_diff_tree_cb;
-- 
2.35.1.46.g38062e73e0



More information about the CGit mailing list