List for cgit developers and users
 help / color / mirror / Atom feed
From: Vegard Nossum <vegard.nossum@oracle.com>
To: cgit@lists.zx2c4.com
Cc: konstantin@linuxfoundation.org, Vegard Nossum <vegard.nossum@oracle.com>
Subject: [PATCH 3/6] git: handle diff_queue_is_empty() changes
Date: Mon, 17 Oct 2022 13:50:07 +0200	[thread overview]
Message-ID: <20221017115010.21977-4-vegard.nossum@oracle.com> (raw)
In-Reply-To: <20221017115010.21977-1-vegard.nossum@oracle.com>

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@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


  parent reply	other threads:[~2022-10-17 11:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-17 11:50 git notes for the Linux kernel Vegard Nossum
2022-10-17 11:50 ` [PATCH 1/6] Support notes from external repositories Vegard Nossum
2022-10-17 11:50 ` Vegard Nossum [this message]
2022-10-17 11:50 ` [PATCH 4/6] git: handle string_list_init_{nodup, dup}() changes for ctx.cfg.mimetypes Vegard Nossum
2022-10-17 11:50 ` [PATCH 5/6] cgit: add extra alternates Vegard Nossum
2022-10-17 12:12 ` git notes for the Linux kernel Vegard Nossum
2022-10-18 20:20 ` John Keeping

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221017115010.21977-4-vegard.nossum@oracle.com \
    --to=vegard.nossum@oracle.com \
    --cc=cgit@lists.zx2c4.com \
    --cc=konstantin@linuxfoundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).