From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Dec 2014 22:31:40 +0000 (-0800)
Subject: Merge branch 'jk/push-simple'
X-Git-Tag: v2.3.0-rc0~82
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/23c0956441a101b2e8eca7e063e71bdc69a0c415?ds=inline;hp=-c

Merge branch 'jk/push-simple'

Git 2.0 was supposed to make the "simple" mode for the default of
"git push", but it didn't.

* jk/push-simple:
push: truly use "simple" as default, not "upstream"
---

23c0956441a101b2e8eca7e063e71bdc69a0c415
diff --combined builtin/push.c
index cfa20c266b,5c3853b554..12f5e69393
--- a/builtin/push.c
+++ b/builtin/push.c
@@@ -127,10 -127,11 +127,10 @@@ static NORETURN int die_push_simple(str
  	 * them the big ugly fully qualified ref.
  	 */
  	const char *advice_maybe = "";
 -	const char *short_upstream =
 -		skip_prefix(branch->merge[0]->src, "refs/heads/");
 +	const char *short_upstream = branch->merge[0]->src;
 +
 +	skip_prefix(short_upstream, "refs/heads/", &short_upstream);
  
 -	if (!short_upstream)
 -		short_upstream = branch->merge[0]->src;
  	/*
  	 * Don't show advice for people who explicitly set
  	 * push.default.
@@@ -161,7 -162,7 +161,7 @@@ static const char message_detached_head
  	   "    git push %s HEAD:<name-of-remote-branch>\n");
  
  static void setup_push_upstream(struct remote *remote, struct branch *branch,
- 				int triangular)
+ 				int triangular, int simple)
  {
  	struct strbuf refspec = STRBUF_INIT;
  
@@@ -184,7 -185,7 +184,7 @@@
  		      "to update which remote branch."),
  		    remote->name, branch->name);
  
- 	if (push_default == PUSH_DEFAULT_SIMPLE) {
+ 	if (simple) {
  		/* Additional safety */
  		if (strcmp(branch->refname, branch->merge[0]->src))
  			die_push_simple(branch, remote);
@@@ -257,11 -258,11 +257,11 @@@ static void setup_default_push_refspecs
  		if (triangular)
  			setup_push_current(remote, branch);
  		else
- 			setup_push_upstream(remote, branch, triangular);
+ 			setup_push_upstream(remote, branch, triangular, 1);
  		break;
  
  	case PUSH_DEFAULT_UPSTREAM:
- 		setup_push_upstream(remote, branch, triangular);
+ 		setup_push_upstream(remote, branch, triangular, 0);
  		break;
  
  	case PUSH_DEFAULT_CURRENT:
@@@ -471,17 -472,6 +471,17 @@@ static int option_parse_recurse_submodu
  	return 0;
  }
  
 +static int git_push_config(const char *k, const char *v, void *cb)
 +{
 +	struct wt_status *s = cb;
 +	int status;
 +
 +	status = git_gpg_config(k, v, NULL);
 +	if (status)
 +		return status;
 +	return git_default_config(k, v, s);
 +}
 +
  int cmd_push(int argc, const char **argv, const char *prefix)
  {
  	int flags = 0;
@@@ -503,7 -493,7 +503,7 @@@
  		  0, CAS_OPT_NAME, &cas, N_("refname>:<expect"),
  		  N_("require old value of ref to be at this value"),
  		  PARSE_OPT_OPTARG, parseopt_push_cas_option },
 -		{ OPTION_CALLBACK, 0, "recurse-submodules", &flags, N_("check"),
 +		{ OPTION_CALLBACK, 0, "recurse-submodules", &flags, "check|on-demand",
  			N_("control recursive pushing of submodules"),
  			PARSE_OPT_OPTARG, option_parse_recurse_submodules },
  		OPT_BOOL( 0 , "thin", &thin, N_("use thin pack")),
@@@ -517,12 -507,11 +517,12 @@@
  		OPT_BIT(0, "no-verify", &flags, N_("bypass pre-push hook"), TRANSPORT_PUSH_NO_HOOK),
  		OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"),
  			TRANSPORT_PUSH_FOLLOW_TAGS),
 +		OPT_BIT(0, "signed", &flags, N_("GPG sign the push"), TRANSPORT_PUSH_CERT),
  		OPT_END()
  	};
  
  	packet_trace_identity("push");
 -	git_config(git_default_config, NULL);
 +	git_config(git_push_config, NULL);
  	argc = parse_options(argc, argv, prefix, options, push_usage, 0);
  
  	if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))