[PATCH 1/1] RFC: git: update to v2.11.0-rc3

[PATCH 1/1] RFC: git: update to v2.11.0-rc3

[list]

From: Christian Hesse <mail at eworm.de>

Update to git version v2.11.0-rc3. Function write_archive() dropped
argument (int setup_prefix).

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile      | 4 ++--
 git           | 2 +-
 ui-snapshot.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1ab2905..a585b01 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.10.2
-GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
+GIT_VER = 2.11.0.rc3
+GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
 INSTALL = install
 COPYTREE = cp -r
 MAN5_TXT = $(wildcard *.5.txt)
diff --git a/git b/git
index 6406bdc..e2b2d6a 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 6406bdc0b95715a087fdeeb0f6adf3deb80a25b8
+Subproject commit e2b2d6a172b76d44cb7b1ddb12ea5bfac9613a44
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

[PATCH 1/1] RFC: git: update to v2.11.0-rc3

[john]

On Thu, Nov 24, 2016 at 09:09:43AM +0100, Christian Hesse wrote:
> From: Christian Hesse <mail at eworm.de>
> 
> Update to git version v2.11.0-rc3. Function write_archive() dropped
> argument (int setup_prefix).
> 
> Signed-off-by: Christian Hesse <mail at eworm.de>

Reviewed-by: John Keeping <john at keeping.me.uk>

> ---
>  Makefile      | 4 ++--
>  git           | 2 +-
>  ui-snapshot.c | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 1ab2905..a585b01 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.10.2
> -GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.gz
> +GIT_VER = 2.11.0.rc3
> +GIT_URL = https://www.kernel.org/pub/software/scm/git/testing/git-$(GIT_VER).tar.gz
>  INSTALL = install
>  COPYTREE = cp -r
>  MAN5_TXT = $(wildcard *.5.txt)
> diff --git a/git b/git
> index 6406bdc..e2b2d6a 160000
> --- a/git
> +++ b/git
> @@ -1 +1 @@
> -Subproject commit 6406bdc0b95715a087fdeeb0f6adf3deb80a25b8
> +Subproject commit e2b2d6a172b76d44cb7b1ddb12ea5bfac9613a44
> 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
> 
> _______________________________________________
> CGit mailing list
> CGit at lists.zx2c4.com
> http://lists.zx2c4.com/mailman/listinfo/cgit