From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jun 2018 19:53:30 +0000 (-0700)
Subject: Merge branch 'ms/send-pack-honor-config'
X-Git-Tag: v2.19.0-rc0~175
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8d3661d5b1c7ca698a863625a05888c66004d3c1?ds=inline;hp=-c

Merge branch 'ms/send-pack-honor-config'

"git send-pack --signed" (hence "git push --signed" over the http
transport) did not read user ident from the config mechanism to
determine whom to sign the push certificate as, which has been
corrected.

* ms/send-pack-honor-config:
builtin/send-pack: populate the default configs
---

8d3661d5b1c7ca698a863625a05888c66004d3c1
diff --combined builtin/send-pack.c
index 4923b1058c,997a848895..42fd8d1a35
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@@ -14,7 -14,6 +14,7 @@@
  #include "sha1-array.h"
  #include "gpg-interface.h"
  #include "gettext.h"
 +#include "protocol.h"
  
  static const char * const send_pack_usage[] = {
  	N_("git send-pack [--all | --mirror] [--dry-run] [--force] "
@@@ -121,12 -120,13 +121,12 @@@ static int send_pack_config(const char 
  			}
  		}
  	}
- 	return 0;
+ 	return git_default_config(k, v, cb);
  }
  
  int cmd_send_pack(int argc, const char **argv, const char *prefix)
  {
 -	int i, nr_refspecs = 0;
 -	const char **refspecs = NULL;
 +	struct refspec rs = REFSPEC_INIT_PUSH;
  	const char *remote_name = NULL;
  	struct remote *remote = NULL;
  	const char *dest = NULL;
@@@ -154,7 -154,6 +154,7 @@@
  	int progress = -1;
  	int from_stdin = 0;
  	struct push_cas_option cas = {0};
 +	struct packet_reader reader;
  
  	struct option options[] = {
  		OPT__VERBOSITY(&verbose),
@@@ -188,7 -187,8 +188,7 @@@
  	argc = parse_options(argc, argv, prefix, options, send_pack_usage, 0);
  	if (argc > 0) {
  		dest = argv[0];
 -		refspecs = (const char **)(argv + 1);
 -		nr_refspecs = argc - 1;
 +		refspec_appendn(&rs, argv + 1, argc - 1);
  	}
  
  	if (!dest)
@@@ -207,23 -207,31 +207,23 @@@
  	args.push_options = push_options.nr ? &push_options : NULL;
  
  	if (from_stdin) {
 -		struct argv_array all_refspecs = ARGV_ARRAY_INIT;
 -
 -		for (i = 0; i < nr_refspecs; i++)
 -			argv_array_push(&all_refspecs, refspecs[i]);
 -
  		if (args.stateless_rpc) {
  			const char *buf;
  			while ((buf = packet_read_line(0, NULL)))
 -				argv_array_push(&all_refspecs, buf);
 +				refspec_append(&rs, buf);
  		} else {
  			struct strbuf line = STRBUF_INIT;
  			while (strbuf_getline(&line, stdin) != EOF)
 -				argv_array_push(&all_refspecs, line.buf);
 +				refspec_append(&rs, line.buf);
  			strbuf_release(&line);
  		}
 -
 -		refspecs = all_refspecs.argv;
 -		nr_refspecs = all_refspecs.argc;
  	}
  
  	/*
  	 * --all and --mirror are incompatible; neither makes sense
  	 * with any refspecs.
  	 */
 -	if ((nr_refspecs > 0 && (send_all || args.send_mirror)) ||
 +	if ((rs.nr > 0 && (send_all || args.send_mirror)) ||
  	    (send_all && args.send_mirror))
  		usage_with_options(send_pack_usage, options);
  
@@@ -248,22 -256,10 +248,22 @@@
  			args.verbose ? CONNECT_VERBOSE : 0);
  	}
  
 -	get_remote_heads(fd[0], NULL, 0, &remote_refs, REF_NORMAL,
 -			 &extra_have, &shallow);
 -
 -	transport_verify_remote_names(nr_refspecs, refspecs);
 +	packet_reader_init(&reader, fd[0], NULL, 0,
 +			   PACKET_READ_CHOMP_NEWLINE |
 +			   PACKET_READ_GENTLE_ON_EOF);
 +
 +	switch (discover_version(&reader)) {
 +	case protocol_v2:
 +		die("support for protocol v2 not implemented yet");
 +		break;
 +	case protocol_v1:
 +	case protocol_v0:
 +		get_remote_heads(&reader, &remote_refs, REF_NORMAL,
 +				 &extra_have, &shallow);
 +		break;
 +	case protocol_unknown_version:
 +		BUG("unknown protocol version");
 +	}
  
  	local_refs = get_local_heads();
  
@@@ -275,7 -271,7 +275,7 @@@
  		flags |= MATCH_REFS_MIRROR;
  
  	/* match them up */
 -	if (match_push_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
 +	if (match_push_refs(local_refs, &remote_refs, &rs, flags))
  		return -1;
  
  	if (!is_empty_cas(&cas))