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=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 31286 invoked from network); 17 Oct 2022 11:50:42 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 17 Oct 2022 11:50:42 -0000 Received: by lists.zx2c4.com (OpenSMTPD) with ESMTP id b1cbd5e0; Mon, 17 Oct 2022 11:50:26 +0000 (UTC) Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lists.zx2c4.com (OpenSMTPD) with ESMTP id 329440d5 for ; Mon, 17 Oct 2022 11:50:24 +0000 (UTC) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29H9VwNK030885; Mon, 17 Oct 2022 11:50:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2022-7-12; bh=SwUzKR1Uf3bdZUTyAi4MhTAOKDOaAe0F9ij29JQ0rqc=; b=l1Tx9DbAkWjEkgfXqmYEeTnX5ISGOd6TXvxL8K6w2XuzjVKfJAv56Ewl2ljw32m+e+Qq 972OB9GkSzf3RNi/pdGM1p8D4Z8zJ3b7oLpAHoPxX9qEmWXJFl6HA1lvAwKemyA1A2R4 Ybv16zdR7EddQJIFB4B1uB0n2kuS0yHh4XoSkFef/7lis1xXFG31gYAhRWVpsz6EhPt7 jswf+JhCV3PGA3D3N7cWuAJcsWLayfqyp5EhkXdO+U0eMeLisLhSgTs1/AE9vrB/A3xT J5hYsRRH7f6tq/v0oRM0Kd6wwZknaMz4IUIFVDQoxuyNOpz4i2Y2qWY7GJuKP4L0kEjD Cw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3k7mtyud7h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Oct 2022 11:50:22 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 29H8t5lx027543; Mon, 17 Oct 2022 11:50:22 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3k8hqx7kan-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Oct 2022 11:50:22 +0000 Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 29HBoICp030872; Mon, 17 Oct 2022 11:50:21 GMT Received: from t460.home (dhcp-10-175-3-136.vpn.oracle.com [10.175.3.136]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3k8hqx7k5g-4; Mon, 17 Oct 2022 11:50:21 +0000 From: Vegard Nossum To: cgit@lists.zx2c4.com Cc: konstantin@linuxfoundation.org, Vegard Nossum Subject: [PATCH 3/6] git: handle diff_queue_is_empty() changes Date: Mon, 17 Oct 2022 13:50:07 +0200 Message-Id: <20221017115010.21977-4-vegard.nossum@oracle.com> X-Mailer: git-send-email 2.35.1.46.g38062e73e0 In-Reply-To: <20221017115010.21977-1-vegard.nossum@oracle.com> References: <20221017115010.21977-1-vegard.nossum@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-17_09,2022-10-17_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210170068 X-Proofpoint-ORIG-GUID: C4Lp84lG6INe0_ZC7-st3AalFd_5PJ67 X-Proofpoint-GUID: C4Lp84lG6INe0_ZC7-st3AalFd_5PJ67 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" 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 --- 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