From: Christian Hesse <m...@eworm.de>
Update to git version v2.51.0-rc1, this requires changes for these
upstream commits:
* 8f49151763cb81adf4bcec53c1ae67057081b02d
object-store: rename files to "odb.{c,h}"
Signed-off-by: Christian Hesse <m...@eworm.de>
---
Makefile | 4 ++--
cgit.h | 2 +-
git | 2 +-
ui-clone.c | 1 -
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index a97d9d4..67ca081 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ htmldir = $(docdir)
pdfdir = $(docdir)
mandir = $(prefix)/share/man
SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.50.1
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
+GIT_VER = 2.51.0.rc1
+GIT_URL =
https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.xz
INSTALL = install
COPYTREE = cp -r
MAN5_TXT = $(wildcard *.5.txt)
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..2c2ba49 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d82adb61ba2fd11d8f2587fca1b6bd7925ce4044
+Subproject commit 2c2ba49d55ff26c1082b8137b1ec5eeccb4337d1
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)
