add gzip bug patch from git-for-windows

see: git-for-windows/git#2077

Author: r1walz

[FIX] git-archive error, gzip -cn : command not found/0000-cover-letter.patch

@@ -0,0 +1,23 @@
+From f31f5cf29030b1ee0fb25b61845404de054c4bd0 Mon Sep 17 00:00:00 2001
+From: Rohit Ashiwal <[email protected]>
+Date: Wed, 29 May 2019 09:04:15 +0530
+Subject: [PATCH 0/2] [FIX] git-archive error, gzip -cn : command not found
+
+git-archive uses `gzip -cn` to compress tar files but for this to work, gzip needs
+to be present on the host system, which sometimes is not the case.
+
+In our implementation, we are trying to add minimal code that will mimic gzip
+compression, so as to get rid of this gzip dependency.
+
+Closes: git-for-windows/git#1970
+
+Rohit Ashiwal (2):
+  archive: replace write_or_die() calls with write_block_or_die()
+  archive: avoid spawning `gzip`
+
+ archive-tar.c | 54 ++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 41 insertions(+), 13 deletions(-)
+
+--
+2.21.0
+

[FIX] git-archive error, gzip -cn : command not found/0001-archive-replace-write_or_die-calls-with-write_block_.patch

@@ -0,0 +1,84 @@
+From e00dd10fbd4d00bad4a02563cf0b151f35092189 Mon Sep 17 00:00:00 2001
+From: Rohit Ashiwal <[email protected]>
+Date: Fri, 15 Feb 2019 19:03:57 +0530
+Subject: [PATCH 1/2] [FIX] git-archive error, gzip -cn : command not found
+
+archive: replace write_or_die() calls with
+write_block_or_die() MinGit for Windows comes without `gzip` bundled inside,
+git-archive uses `gzip -cn` to compress tar files but for this to work, gzip
+needs to be present on the host system, which sometimes is not the case
+
+In the next commit, we will change the gzip compression
+so that we no longer spawn `gzip` but let zlib perform
+the compression in the same process
+
+In preparation for this, we consolidate all the block
+writes into a single function
+
+Closes: #1970
+Signed-off-by: Rohit Ashiwal <[email protected]>
+---
+ archive-tar.c | 20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+diff --git a/archive-tar.c b/archive-tar.c
+index a58e1a8ebf..33795075a4 100644
+--- a/archive-tar.c
++++ b/archive-tar.c
+@@ -17,6 +17,8 @@ static unsigned long offset;
+
+ static int tar_umask = 002;
+
++static gzFile gzip;
++
+ static int write_tar_filter_archive(const struct archiver *ar,
+ 				    struct archiver_args *args);
+
+@@ -38,11 +40,21 @@ static int write_tar_filter_archive(const struct archiver *ar,
+ #define USTAR_MAX_MTIME 077777777777ULL
+ #endif
+
++/* writes out the whole block, or dies if fails */
++static void write_block_or_die(const char *block) {
++	if (gzip) {
++		if (gzwrite(gzip, block, (unsigned) BLOCKSIZE) != BLOCKSIZE)
++			die(_("gzwrite failed"));
++	} else {
++		write_or_die(1, block, BLOCKSIZE);
++	}
++}
++
+ /* writes out the whole block, but only if it is full */
+ static void write_if_needed(void)
+ {
+ 	if (offset == BLOCKSIZE) {
+-		write_or_die(1, block, BLOCKSIZE);
++		write_block_or_die(block);
+ 		offset = 0;
+ 	}
+ }
+@@ -66,7 +78,7 @@ static void do_write_blocked(const void *data, unsigned long size)
+ 		write_if_needed();
+ 	}
+ 	while (size >= BLOCKSIZE) {
+-		write_or_die(1, buf, BLOCKSIZE);
++		write_block_or_die(buf);
+ 		size -= BLOCKSIZE;
+ 		buf += BLOCKSIZE;
+ 	}
+@@ -101,10 +113,10 @@ static void write_trailer(void)
+ {
+ 	int tail = BLOCKSIZE - offset;
+ 	memset(block + offset, 0, tail);
+-	write_or_die(1, block, BLOCKSIZE);
++	write_block_or_die(block);
+ 	if (tail < 2 * RECORDSIZE) {
+ 		memset(block, 0, offset);
+-		write_or_die(1, block, BLOCKSIZE);
++		write_block_or_die(block);
+ 	}
+ }
+
+--
+2.21.0
+

[FIX] git-archive error, gzip -cn : command not found/0002-archive-avoid-spawning-gzip.patch

@@ -0,0 +1,68 @@
+From f31f5cf29030b1ee0fb25b61845404de054c4bd0 Mon Sep 17 00:00:00 2001
+From: Rohit Ashiwal <[email protected]>
+Date: Tue, 19 Feb 2019 22:28:41 +0530
+Subject: [PATCH 2/2] [FIX] git-archive error, gzip -cn : command not found
+
+archive: avoid spawning `gzip` As we already link to
+`zlib` library, we can perform the compression without even requiring gzip on
+the host machine
+
+We modify write_tar_filter_archive() function in archive-tar.c
+to handle the compression when `gzip -cn` is requested
+
+Signed-off-by: Rohit Ashiwal <[email protected]>
+---
+ archive-tar.c | 34 +++++++++++++++++++++++++---------
+ 1 file changed, 25 insertions(+), 9 deletions(-)
+
+diff --git a/archive-tar.c b/archive-tar.c
+index 33795075a4..76738c2992 100644
+--- a/archive-tar.c
++++ b/archive-tar.c
+@@ -466,18 +466,34 @@ static int write_tar_filter_archive(const struct archiver *ar,
+ 	filter.use_shell = 1;
+ 	filter.in = -1;
+
+-	if (start_command(&filter) < 0)
+-		die_errno(_("unable to start '%s' filter"), argv[0]);
+-	close(1);
+-	if (dup2(filter.in, 1) < 0)
+-		die_errno(_("unable to redirect descriptor"));
+-	close(filter.in);
++	if (!strcmp("gzip -cn", ar->data)) {
++		char outmode[4] = "wb\0";
++
++		if (args->compression_level >= 0 && args->compression_level <= 9)
++			outmode[2] = '0' + args->compression_level;
++
++		gzip = gzdopen(fileno(stdout), outmode);
++		if (!gzip)
++			die(_("Could not gzdopen stdout"));
++	} else {
++		if (start_command(&filter) < 0)
++			die_errno(_("unable to start '%s' filter"), argv[0]);
++		close(1);
++		if (dup2(filter.in, 1) < 0)
++			die_errno(_("unable to redirect descriptor"));
++		close(filter.in);
++	}
+
+ 	r = write_tar_archive(ar, args);
+
+-	close(1);
+-	if (finish_command(&filter) != 0)
+-		die(_("'%s' filter reported error"), argv[0]);
++	if (gzip) {
++		if (gzclose(gzip) != Z_OK)
++			die(_("gzclose failed"));
++	} else {
++		close(1);
++		if (finish_command(&filter) != 0)
++			die(_("'%s' filter reported error"), argv[0]);
++	}
+
+ 	strbuf_release(&cmd);
+ 	return r;
+--
+2.21.0
+