[PATCH 1/1] git: update to v2.11.0
Christian Hesse
list at eworm.de
Wed Nov 30 10:43:40 CET 2016
From: Christian Hesse <mail at eworm.de>
Update to git version v2.11.0. Function write_archive()
dropped argument (int setup_prefix).
Signed-off-by: Christian Hesse <mail at eworm.de>
---
Makefile | 2 +-
git | 2 +-
ui-snapshot.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 1ab2905..fe6cc98 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.10.2
+GIT_VER = 2.11.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
index ac84098..454cb6b 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit ac84098b7e32406a982ac01cc76a663d5605224b
+Subproject commit 454cb6bd52a4de614a3633e4f547af03d5c3b640
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 08c6e80..9b8cddd 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
/* argv_array guarantees a trailing NULL entry. */
memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
- result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
+ result = write_archive(argv.argc, nargv, NULL, NULL, 0);
argv_array_clear(&argv);
free(nargv);
return result;
--
2.10.2
More information about the CGit
mailing list