From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Oct 2011 02:03:23 +0000 (-0700)
Subject: Merge branch 'il/archive-err-signal'
X-Git-Tag: v1.7.8-rc0~77
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1810abb994b4dd6b7f53dfe0a84b7e24cd43f78b?hp=-c

Merge branch 'il/archive-err-signal'

* il/archive-err-signal:
Support ERR in remote archive like in fetch/push
---

1810abb994b4dd6b7f53dfe0a84b7e24cd43f78b
diff --combined builtin/archive.c
index 883c0092ad,6ec06d3e27..931956def9
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@@ -24,8 -24,7 +24,8 @@@ static void create_output_file(const ch
  }
  
  static int run_remote_archiver(int argc, const char **argv,
 -			       const char *remote, const char *exec)
 +			       const char *remote, const char *exec,
 +			       const char *name_hint)
  {
  	char buf[LARGE_PACKET_MAX];
  	int fd[2], i, len, rv;
@@@ -38,17 -37,6 +38,17 @@@
  	transport = transport_get(_remote, _remote->url[0]);
  	transport_connect(transport, "git-upload-archive", exec, fd);
  
 +	/*
 +	 * Inject a fake --format field at the beginning of the
 +	 * arguments, with the format inferred from our output
 +	 * filename. This way explicit --format options can override
 +	 * it.
 +	 */
 +	if (name_hint) {
 +		const char *format = archive_format_from_filename(name_hint);
 +		if (format)
 +			packet_write(fd[1], "argument --format=%s\n", format);
 +	}
  	for (i = 1; i < argc; i++)
  		packet_write(fd[1], "argument %s\n", argv[i]);
  	packet_flush(fd[1]);
@@@ -61,6 -49,8 +61,8 @@@
  	if (strcmp(buf, "ACK")) {
  		if (len > 5 && !prefixcmp(buf, "NACK "))
  			die(_("git archive: NACK %s"), buf + 5);
+ 		if (len > 4 && !prefixcmp(buf, "ERR "))
+ 			die(_("remote error: %s"), buf + 4);
  		die(_("git archive: protocol error"));
  	}
  
@@@ -75,6 -65,17 +77,6 @@@
  	return !!rv;
  }
  
 -static const char *format_from_name(const char *filename)
 -{
 -	const char *ext = strrchr(filename, '.');
 -	if (!ext)
 -		return NULL;
 -	ext++;
 -	if (!strcasecmp(ext, "zip"))
 -		return "--format=zip";
 -	return NULL;
 -}
 -
  #define PARSE_OPT_KEEP_ALL ( PARSE_OPT_KEEP_DASHDASH | 	\
  			     PARSE_OPT_KEEP_ARGV0 | 	\
  			     PARSE_OPT_KEEP_UNKNOWN |	\
@@@ -85,6 -86,7 +87,6 @@@ int cmd_archive(int argc, const char **
  	const char *exec = "git-upload-archive";
  	const char *output = NULL;
  	const char *remote = NULL;
 -	const char *format_option = NULL;
  	struct option local_opts[] = {
  		OPT_STRING('o', "output", &output, "file",
  			"write the archive to this file"),
@@@ -98,13 -100,32 +100,13 @@@
  	argc = parse_options(argc, argv, prefix, local_opts, NULL,
  			     PARSE_OPT_KEEP_ALL);
  
 -	if (output) {
 +	if (output)
  		create_output_file(output);
 -		format_option = format_from_name(output);
 -	}
 -
 -	/*
 -	 * We have enough room in argv[] to muck it in place, because
 -	 * --output must have been given on the original command line
 -	 * if we get to this point, and parse_options() must have eaten
 -	 * it, i.e. we can add back one element to the array.
 -	 *
 -	 * We add a fake --format option at the beginning, with the
 -	 * format inferred from our output filename.  This way explicit
 -	 * --format options can override it, and the fake option is
 -	 * inserted before any "--" that might have been given.
 -	 */
 -	if (format_option) {
 -		memmove(argv + 2, argv + 1, sizeof(*argv) * argc);
 -		argv[1] = format_option;
 -		argv[++argc] = NULL;
 -	}
  
  	if (remote)
 -		return run_remote_archiver(argc, argv, remote, exec);
 +		return run_remote_archiver(argc, argv, remote, exec, output);
  
  	setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
  
 -	return write_archive(argc, argv, prefix, 1);
 +	return write_archive(argc, argv, prefix, 1, output, 0);
  }