From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 9073 invoked from network); 12 Apr 2022 17:17:53 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 12 Apr 2022 17:17:53 -0000 Received: by lists.zx2c4.com (OpenSMTPD) with ESMTP id c6105732; Tue, 12 Apr 2022 17:17:37 +0000 (UTC) Return-Path: Received: from mx.mylinuxtime.de (mx.mylinuxtime.de [195.201.174.144]) by lists.zx2c4.com (OpenSMTPD) with ESMTPS id 58f53bff (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Tue, 12 Apr 2022 17:17:36 +0000 (UTC) Received: from leda.eworm.de (p54b796d8.dip0.t-ipconnect.de [84.183.150.216]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx.mylinuxtime.de (Postfix) with ESMTPSA id 1FA671CE47D; Tue, 12 Apr 2022 19:17:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eworm.de; s=mail; t=1649783856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=zJxxtC/ORDN5Djvl9vdN2A80YAJ1gjNgIiSzR+RitUs=; b=yqu8CFMWRMC5CEEYKLDlVuAs07sMUpOX01B8DoLI7cF34SPzbRirJOPV1/rfvRhlgNx2ml DtjvyEptiXyyh6fOa65BQMqjQ6dJ485T08YdOLVQT+ddMxIPikd94Em2iXga0n7hBIdw2m +6vA91I+8hWU2XofJk1qC6zBqGecC3Y= Received: by leda.eworm.de (Postfix, from userid 1000) id C35251A29FF; Tue, 12 Apr 2022 19:17:05 +0200 (CEST) From: Christian Hesse To: cgit@lists.zx2c4.com Cc: Christian Hesse Subject: [PATCH 1/1] RFC: git: update to v2.36.0-rc2 Date: Tue, 12 Apr 2022 19:17:01 +0200 Message-Id: <20220412171701.36387-1-list@eworm.de> X-Mailer: git-send-email 2.35.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: mx.mylinuxtime.de; auth=pass smtp.auth=smtp-only@eworm.de smtp.mailfrom=eworm@leda.eworm.de X-Rspamd-Server: mx X-Stat-Signature: qiy1whcmdugn79j4xhehqbxit9cuq37w X-Rspamd-Queue-Id: 1FA671CE47D X-Spamd-Result: default: False [-1.80 / 15.00]; ARC_NA(0.00)[]; GENERIC_REPUTATION(0.00)[-0.7392407053106]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; BROKEN_CONTENT_TYPE(1.50)[]; NEURAL_HAM_LONG(-3.00)[-1.000]; DKIM_SIGNED(0.00)[eworm.de:s=mail]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; FORGED_SENDER(0.30)[list@eworm.de,eworm@leda.eworm.de]; RCVD_COUNT_ZERO(0.00)[0]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:3320, ipnet:84.128.0.0/10, country:DE]; FROM_NEQ_ENVFROM(0.00)[list@eworm.de,eworm@leda.eworm.de]; BAYES_HAM(-3.00)[100.00%] X-BeenThere: cgit@lists.zx2c4.com X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: List for cgit developers and users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cgit-bounces@lists.zx2c4.com Sender: "CGit" From: Christian Hesse Update to git version v2.36.0-rc2, this requires changes for these upstream commits: * 95433eeed9eac439eb21eb30105354b15e71302e diff: add ability to insert additional headers for paths Signed-off-by: Christian Hesse --- Makefile | 4 ++-- git | 2 +- ui-log.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e9c4e39..0ac049e 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.35.2 -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz +GIT_VER = 2.36.0.rc2 +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r MAN5_TXT = $(wildcard *.5.txt) diff --git a/git b/git index 53ef17d..11cfe55 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 53ef17d3ee0f7fcb151f428ee3bd736b8046825f +Subproject commit 11cfe552610386954886543f5de87dcc49ad5735 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.35.2