summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2017-10-30 11:06:17 +0100
committerChristian Hesse <mail@eworm.de>2017-10-30 11:06:17 +0100
commitccfe4dc19045ee590b5df5f45f3f0f0104f63d23 (patch)
tree58bcae226589ba4e1442f7e4dadb1aabc4da61bb
parent67d0f870506e3bc3703ae3cb2cb00e19691ce967 (diff)
downloadcgit-ch/git-2-15-0.tar.gz
git: update to v2.15.0ch/git-2-15-0
Update to git version v2.15.0: With commit 0abe14f6 prepare_packed_git() moved to packfile.[ch].
-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..8e90d9c 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.0
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 cb5918aa0d50f50e83787f65c2ddc3dcb10159f
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)