about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorChristian Hesse2016-11-30 10:43:08 +0100
committerChristian Hesse2016-11-30 10:43:08 +0100
commit91153fd02e62f2eaca8e6c140baa4f2abf39c40e (patch)
tree6f132121243ba2e5702364be71f9572004bbb5fb
parentLink with -ldl on GNU Hurd (diff)
downloadcgit-91153fd02e62f2eaca8e6c140baa4f2abf39c40e.tar.gz
cgit-91153fd02e62f2eaca8e6c140baa4f2abf39c40e.zip
git: update to v2.11.0
Update to git version v2.11.0. Function write_archive()
dropped argument (int setup_prefix).
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-snapshot.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile index 1ab2905..fe6cc98 100644 --- a/Makefile +++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
14pdfdir = $(docdir) 14pdfdir = $(docdir)
15mandir = $(prefix)/share/man 15mandir = $(prefix)/share/man
16SHA1_HEADER = <openssl/sha.h> 16SHA1_HEADER = <openssl/sha.h>
17GIT_VER = 2.10.2 17GIT_VER = 2.11.0
18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz 18GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
19INSTALL = install 19INSTALL = install
20COPYTREE = cp -r 20COPYTREE = cp -r
diff --git a/git b/git
Subproject ac84098b7e32406a982ac01cc76a663d5605224 Subproject 454cb6bd52a4de614a3633e4f547af03d5c3b64
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
37 /* argv_array guarantees a trailing NULL entry. */ 37 /* argv_array guarantees a trailing NULL entry. */
38 memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1)); 38 memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
39 39
40 result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0); 40 result = write_archive(argv.argc, nargv, NULL, NULL, 0);
41 argv_array_clear(&argv); 41 argv_array_clear(&argv);
42 free(nargv); 42 free(nargv);
43 return result; 43 return result;