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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 12673 invoked from network); 9 Dec 2023 19:08:36 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 9 Dec 2023 19:08:36 -0000 Received: by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 48a2b6d8; Sat, 9 Dec 2023 19:08:19 +0000 (UTC) Return-Path: Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [2a00:1450:4864:20::42d]) by lists.zx2c4.com (ZX2C4 Mail Server) with ESMTPS id 2303a837 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 9 Dec 2023 19:08:17 +0000 (UTC) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-332c0c32d19so3752711f8f.3 for ; Sat, 09 Dec 2023 11:08:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702148897; x=1702753697; darn=lists.zx2c4.com; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=J74pEXbPtsncK9r1EMv6H1GyptJGhbtpPuazcs3TaDg=; b=kKTrULDQuk3d5ujB5AEnGozBfD/NytebjzgJgkBWlKmmID4vpd4hJNmrK2zEKzLJBG 72ZCCk4uolYh939NYyMlIK2gaaYQrOwOdBVNmGggmISvja2ia0q3VxOy1kYQsen8BN0B 3/+0G2wJVU7oPFtxZWOx0Fhfte58d1V5mayBX9Q/hHrR2vZtg29B1pi9Dq9tRIO0oqlB QwS0kVGfahIooMLSk3A1jj3TtR69hdBmQRuKmfZi5iK47l5fN7EpLEmojNeIYzlmrjAU 4R1ZlMxomUf2jKfYsaXiZbbGYuY/oNpfJa9JYywagJeuXLAzLS8zRPrlfzNRm5BVeCGX lXAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702148897; x=1702753697; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=J74pEXbPtsncK9r1EMv6H1GyptJGhbtpPuazcs3TaDg=; b=bjA5Vm9iUbS7ecIw+N0MgzrGMcSjljjnaYoKWED0iy3tvxxHdhCcE5KPGCfvUBSVqT w430MtkXjt5MLfL+8nY3Xsj+ejee1wk+qMAf39eB0jAd78RkCABg4m6zKnWfscrlf3hu KbhGSVNCg39xleOuYhwumFyWPkNIJfPP+ORW/p3qmf7sOzVXS4UTfrDPcrgfJkwB2L98 4cpgT2SCvkPM15jwWJeY66Va+zlZ5MQIobc5WeMJh4nrFU6Ir6pADRIPABrY8bxOcMZ0 GRpzSX6RxCjoDgwh+BYDe3M7LPZrJAcjDgYdTWHjSCl/y6DgdMTRMi1mBcZG/pli8a1Q YMNg== X-Gm-Message-State: AOJu0YxbPzX1f6bIpNKcOilGo9cWjzpWlW4ykNGc9IjlDQg12pVeJo5Q nB9zNXzaTrAfDWgFdDL7l5ZSZbYYBCLQ6MfJDPwkmG0nyzc= X-Google-Smtp-Source: AGHT+IGKYsTcllkjPToBsIrMbnSThyb2Uga+SzwpKgKgUrETzGXJWE5ayP18syKS/Q6vz5YeDjkMwbU+sB0MwS4P7/Q= X-Received: by 2002:a05:600c:4e8d:b0:401:b6f6:d90c with SMTP id f13-20020a05600c4e8d00b00401b6f6d90cmr937757wmq.35.1702148896950; Sat, 09 Dec 2023 11:08:16 -0800 (PST) MIME-Version: 1.0 From: jean-christophe manciot Date: Sat, 9 Dec 2023 20:08:05 +0100 Message-ID: Subject: Cannot apply v2.42.0 patch To: cgit@lists.zx2c4.com Content-Type: text/plain; charset="UTF-8" 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" with git: 1:2.43.0-0ppa1~ubuntu23.10.1 $ git checkout 1.2.3-54-g00ecfaa $ git am patch_file # contains the 'Update to git version v2.42.0' email Applying: Update to git version v2.42.0, this requires changes for these error: patch failed: Makefile:14 error: Makefile: patch does not apply error: patch failed: cgit.h:6 error: cgit.h: patch does not apply error: patch failed: git:1 error: git: patch does not apply error: patch failed: scan-tree.c:54 error: scan-tree.c: patch does not apply Patch failed at 0001 Update to git version v2.42.0, this requires changes for these hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". $ git am --show-current-patch=diff --- Makefile | 2 +- cgit.h | 2 +- git | 2 +- scan-tree.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b0de0ee..036a8e9 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = -GIT_VER = 2.41.0 +GIT_VER = 2.42.0 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz INSTALL = install COPYTREE = cp -r diff --git a/cgit.h b/cgit.h index f788fd2..dbc461f 100644 --- a/cgit.h +++ b/cgit.h @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -19,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/git b/git index fe86abd..43c8a30 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit fe86abd7511a9a6862d5706c6fa1d9b57a63ba09 +Subproject commit 43c8a30d150ecede9709c1f2527c8fba92c65f40 diff --git a/scan-tree.c b/scan-tree.c index 6a2f65a..84da86e 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -54,7 +54,7 @@ static void scan_tree_repo_config(const char *name, const char *value) config_fn(repo, name, value); } -static int gitconfig_config(const char *key, const char *value, void *cb) +static int gitconfig_config(const char *key, const char *value, const struct config_context *, void *cb) { const char *name; -- 2.41.0 Am I doing something wrong? -- Jean-Christophe