summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2017-11-29 21:25:42 +0000
committerChristian Hesse <mail@eworm.de>2017-12-06 19:29:10 +0000
commit5d947ba3f06ec2c7200aab8c22170e7f2bf55a7c (patch)
treedfae2c36534214d513607fcc4beceaa1c7657256
parent67d0f870506e3bc3703ae3cb2cb00e19691ce967 (diff)
downloadcgit-5d947ba3f06ec2c7200aab8c22170e7f2bf55a7c.tar
cgit-5d947ba3f06ec2c7200aab8c22170e7f2bf55a7c.tar.gz
cgit-5d947ba3f06ec2c7200aab8c22170e7f2bf55a7c.zip
git: update to v2.15.1
Update to git version v2.15.1: With commit 0abe14f6 prepare_packed_git() moved to packfile.[ch]. Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-clone.c1
3 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f3ee84c..274f37e 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.14.0
+GIT_VER = 2.15.1
GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
INSTALL = install
COPYTREE = cp -r
diff --git a/git b/git
-Subproject 4384e3cde2ce8ecd194202e171ae16333d24132
+Subproject 9b185bef0c15cec1ea8753ce091e42ea041f2c3
diff --git a/ui-clone.c b/ui-clone.c
index 0d11672..bc98980 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -11,6 +11,7 @@
#include "ui-clone.h"
#include "html.h"
#include "ui-shared.h"
+#include "packfile.h"
static int print_ref_info(const char *refname, const struct object_id *oid,
int flags, void *cb_data)