List for cgit developers and users
 help / color / mirror / Atom feed
* [PATCH 1/1] git: update to v2.51.0
@ 2025-08-18 19:16 Christian Hesse
  0 siblings, 0 replies; only message in thread
From: Christian Hesse @ 2025-08-18 19:16 UTC (permalink / raw)
  To: cgit; +Cc: Christian Hesse

From: Christian Hesse <mail@eworm.de>

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

* 8f49151763cb81adf4bcec53c1ae67057081b02d
  object-store: rename files to "odb.{c,h}"

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

diff --git a/Makefile b/Makefile
index a97d9d4..60075af 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.50.1
+GIT_VER = 2.51.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 9146d9a..653ec28 100644
--- a/cgit.h
+++ b/cgit.h
@@ -17,7 +17,7 @@
 #include <notes.h>
 #include <object.h>
 #include <object-name.h>
-#include <object-store.h>
+#include <odb.h>
 #include <path.h>
 #include <refs.h>
 #include <revision.h>
diff --git a/git b/git
index d82adb6..c44beea 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d82adb61ba2fd11d8f2587fca1b6bd7925ce4044
+Subproject commit c44beea485f0f2feaf460e2ac87fdd5608d63cf0
diff --git a/ui-clone.c b/ui-clone.c
index 2ed3e1c..0fadf24 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -14,7 +14,6 @@
 #include "html.h"
 #include "ui-shared.h"
 #include "packfile.h"
-#include "object-store.h"
 
 static int print_ref_info(const char *refname, const char *referent UNUSED,
 			  const struct object_id *oid, int flags, void *cb_data)

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2025-08-18 19:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-08-18 19:16 [PATCH 1/1] git: update to v2.51.0 Christian Hesse

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).