List for cgit developers and users
 help / color / mirror / Atom feed
From: Christian Hesse <list@eworm.de>
To: cgit@lists.zx2c4.com
Cc: Christian Hesse <mail@eworm.de>
Subject: [PATCH 1/1] git: update to v2.36.0
Date: Mon, 18 Apr 2022 22:17:39 +0200	[thread overview]
Message-ID: <20220418201739.35439-1-list@eworm.de> (raw)

From: Christian Hesse <mail@eworm.de>

Update to git version v2.36.0, this requires changes for these
upstream commits:

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

Signed-off-by: Christian Hesse <mail@eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 ui-log.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index de72176..2509d21 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.35.3
+GIT_VER = 2.36.0
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index d516b2d..6cd33dc 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d516b2db0af2221bd6b13e7347abdcb5830b2829
+Subproject commit 6cd33dceed60949e2dbc32e3f0f5e67c4c882e1e
diff --git a/ui-log.c b/ui-log.c
index 20774bf..565929f 100644
--- 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);
 
-	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;
-- 
2.36.0


             reply	other threads:[~2022-04-18 20:18 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-18 20:17 Christian Hesse [this message]
2022-05-17 22:09 ` june

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=20220418201739.35439-1-list@eworm.de \
    --to=list@eworm.de \
    --cc=cgit@lists.zx2c4.com \
    --cc=mail@eworm.de \
    /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).