* Cannot apply v2.42.0 patch
@ 2023-12-09 19:08 jean-christophe manciot
0 siblings, 0 replies; only message in thread
From: jean-christophe manciot @ 2023-12-09 19:08 UTC (permalink / raw)
To: 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 = <openssl/sha.h>
-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 <git-compat-util.h>
#include <archive.h>
-#include <cache.h>
#include <commit.h>
#include <diffcore.h>
#include <diff.h>
@@ -19,6 +18,7 @@
#include <object.h>
#include <object-name.h>
#include <object-store.h>
+#include <path.h>
#include <refs.h>
#include <revision.h>
#include <setup.h>
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-12-09 19:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-09 19:08 Cannot apply v2.42.0 patch jean-christophe manciot
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).