summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2025-08-09 00:17:51 +0200
committerChristian Hesse <mail@eworm.de>2025-08-18 21:14:41 +0200
commit334640962c7fa96d407d1c71df709c94708bcef9 (patch)
treeebfb4528062c37d9b8f9966de6c208c26cd3098e
parentgit: update to v2.50.1 (diff)
downloadcgit-334640962c7fa96d407d1c71df709c94708bcef9.tar.gz
cgit-334640962c7fa96d407d1c71df709c94708bcef9.tar.bz2
cgit-334640962c7fa96d407d1c71df709c94708bcef9.zip
git: update to v2.51.0
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>
-rw-r--r--Makefile2
-rw-r--r--cgit.h2
m---------git0
-rw-r--r--ui-clone.c1
4 files changed, 2 insertions, 3 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
-Subproject d82adb61ba2fd11d8f2587fca1b6bd7925ce404
+Subproject c44beea485f0f2feaf460e2ac87fdd5608d63cf
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)