 06708ce180
			
		
	
	06708ce180
	
	
	
		
			
			Add the `parse_transport_option()` method to parse the `push.pushOption` configuration. This method will also be used in the next commit to handle the new `remote.<name>.serverOption` configuration for setting server options in Git protocol v2. Signed-off-by: Xing Xin <xingxin.xx@bytedance.com> Reviewed-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			671 lines
		
	
	
		
			21 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			671 lines
		
	
	
		
			21 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * "git push"
 | |
|  */
 | |
| #define USE_THE_REPOSITORY_VARIABLE
 | |
| #include "builtin.h"
 | |
| #include "advice.h"
 | |
| #include "branch.h"
 | |
| #include "config.h"
 | |
| #include "environment.h"
 | |
| #include "gettext.h"
 | |
| #include "refspec.h"
 | |
| #include "run-command.h"
 | |
| #include "remote.h"
 | |
| #include "transport.h"
 | |
| #include "parse-options.h"
 | |
| #include "pkt-line.h"
 | |
| #include "submodule.h"
 | |
| #include "submodule-config.h"
 | |
| #include "send-pack.h"
 | |
| #include "trace2.h"
 | |
| #include "color.h"
 | |
| 
 | |
| static const char * const push_usage[] = {
 | |
| 	N_("git push [<options>] [<repository> [<refspec>...]]"),
 | |
| 	NULL,
 | |
| };
 | |
| 
 | |
| static int push_use_color = -1;
 | |
| static char push_colors[][COLOR_MAXLEN] = {
 | |
| 	GIT_COLOR_RESET,
 | |
| 	GIT_COLOR_RED,	/* ERROR */
 | |
| };
 | |
| 
 | |
| enum color_push {
 | |
| 	PUSH_COLOR_RESET = 0,
 | |
| 	PUSH_COLOR_ERROR = 1
 | |
| };
 | |
| 
 | |
| static int parse_push_color_slot(const char *slot)
 | |
| {
 | |
| 	if (!strcasecmp(slot, "reset"))
 | |
| 		return PUSH_COLOR_RESET;
 | |
| 	if (!strcasecmp(slot, "error"))
 | |
| 		return PUSH_COLOR_ERROR;
 | |
| 	return -1;
 | |
| }
 | |
| 
 | |
| static const char *push_get_color(enum color_push ix)
 | |
| {
 | |
| 	if (want_color_stderr(push_use_color))
 | |
| 		return push_colors[ix];
 | |
| 	return "";
 | |
| }
 | |
| 
 | |
| static int thin = 1;
 | |
| static int deleterefs;
 | |
| static const char *receivepack;
 | |
| static int verbosity;
 | |
| static int progress = -1;
 | |
| static int recurse_submodules = RECURSE_SUBMODULES_DEFAULT;
 | |
| static enum transport_family family;
 | |
| 
 | |
| static struct push_cas_option cas;
 | |
| 
 | |
| static struct refspec rs = REFSPEC_INIT_PUSH;
 | |
| 
 | |
| static struct string_list push_options_config = STRING_LIST_INIT_DUP;
 | |
| 
 | |
| static void refspec_append_mapped(struct refspec *refspec, const char *ref,
 | |
| 				  struct remote *remote, struct ref *matched)
 | |
| {
 | |
| 	const char *branch_name;
 | |
| 
 | |
| 	if (remote->push.nr) {
 | |
| 		struct refspec_item query = {
 | |
| 			.src = matched->name,
 | |
| 		};
 | |
| 
 | |
| 		if (!query_refspecs(&remote->push, &query) && query.dst) {
 | |
| 			refspec_appendf(refspec, "%s%s:%s",
 | |
| 					query.force ? "+" : "",
 | |
| 					query.src, query.dst);
 | |
| 			free(query.dst);
 | |
| 			return;
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	if (push_default == PUSH_DEFAULT_UPSTREAM &&
 | |
| 	    skip_prefix(matched->name, "refs/heads/", &branch_name)) {
 | |
| 		struct branch *branch = branch_get(branch_name);
 | |
| 		if (branch->merge_nr == 1 && branch->merge[0]->src) {
 | |
| 			refspec_appendf(refspec, "%s:%s",
 | |
| 					ref, branch->merge[0]->src);
 | |
| 			return;
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	refspec_append(refspec, ref);
 | |
| }
 | |
| 
 | |
| static void set_refspecs(const char **refs, int nr, struct remote *remote)
 | |
| {
 | |
| 	struct ref *local_refs = NULL;
 | |
| 	int i;
 | |
| 
 | |
| 	for (i = 0; i < nr; i++) {
 | |
| 		const char *ref = refs[i];
 | |
| 		if (!strcmp("tag", ref)) {
 | |
| 			if (nr <= ++i)
 | |
| 				die(_("tag shorthand without <tag>"));
 | |
| 			ref = refs[i];
 | |
| 			if (deleterefs)
 | |
| 				refspec_appendf(&rs, ":refs/tags/%s", ref);
 | |
| 			else
 | |
| 				refspec_appendf(&rs, "refs/tags/%s", ref);
 | |
| 		} else if (deleterefs) {
 | |
| 			if (strchr(ref, ':') || !*ref)
 | |
| 				die(_("--delete only accepts plain target ref names"));
 | |
| 			refspec_appendf(&rs, ":%s", ref);
 | |
| 		} else if (!strchr(ref, ':')) {
 | |
| 			struct ref *matched = NULL;
 | |
| 
 | |
| 			/* lazily grab local_refs */
 | |
| 			if (!local_refs)
 | |
| 				local_refs = get_local_heads();
 | |
| 
 | |
| 			/* Does "ref" uniquely name our ref? */
 | |
| 			if (count_refspec_match(ref, local_refs, &matched) != 1)
 | |
| 				refspec_append(&rs, ref);
 | |
| 			else
 | |
| 				refspec_append_mapped(&rs, ref, remote, matched);
 | |
| 		} else
 | |
| 			refspec_append(&rs, ref);
 | |
| 	}
 | |
| 	free_refs(local_refs);
 | |
| }
 | |
| 
 | |
| static NORETURN void die_push_simple(struct branch *branch,
 | |
| 				     struct remote *remote)
 | |
| {
 | |
| 	/*
 | |
| 	 * There's no point in using shorten_unambiguous_ref here,
 | |
| 	 * as the ambiguity would be on the remote side, not what
 | |
| 	 * we have locally. Plus, this is supposed to be the simple
 | |
| 	 * mode. If the user is doing something crazy like setting
 | |
| 	 * upstream to a non-branch, we should probably be showing
 | |
| 	 * them the big ugly fully qualified ref.
 | |
| 	 */
 | |
| 	const char *advice_pushdefault_maybe = "";
 | |
| 	const char *advice_automergesimple_maybe = "";
 | |
| 	const char *short_upstream = branch->merge[0]->src;
 | |
| 
 | |
| 	skip_prefix(short_upstream, "refs/heads/", &short_upstream);
 | |
| 
 | |
| 	/*
 | |
| 	 * Don't show advice for people who explicitly set
 | |
| 	 * push.default.
 | |
| 	 */
 | |
| 	if (push_default == PUSH_DEFAULT_UNSPECIFIED)
 | |
| 		advice_pushdefault_maybe = _("\n"
 | |
| 				 "To choose either option permanently, "
 | |
| 				 "see push.default in 'git help config'.\n");
 | |
| 	if (git_branch_track != BRANCH_TRACK_SIMPLE)
 | |
| 		advice_automergesimple_maybe = _("\n"
 | |
| 				 "To avoid automatically configuring "
 | |
| 				 "an upstream branch when its name\n"
 | |
| 				 "won't match the local branch, see option "
 | |
| 				 "'simple' of branch.autoSetupMerge\n"
 | |
| 				 "in 'git help config'.\n");
 | |
| 	die(_("The upstream branch of your current branch does not match\n"
 | |
| 	      "the name of your current branch.  To push to the upstream branch\n"
 | |
| 	      "on the remote, use\n"
 | |
| 	      "\n"
 | |
| 	      "    git push %s HEAD:%s\n"
 | |
| 	      "\n"
 | |
| 	      "To push to the branch of the same name on the remote, use\n"
 | |
| 	      "\n"
 | |
| 	      "    git push %s HEAD\n"
 | |
| 	      "%s%s"),
 | |
| 	    remote->name, short_upstream,
 | |
| 	    remote->name, advice_pushdefault_maybe,
 | |
| 	    advice_automergesimple_maybe);
 | |
| }
 | |
| 
 | |
| static const char message_detached_head_die[] =
 | |
| 	N_("You are not currently on a branch.\n"
 | |
| 	   "To push the history leading to the current (detached HEAD)\n"
 | |
| 	   "state now, use\n"
 | |
| 	   "\n"
 | |
| 	   "    git push %s HEAD:<name-of-remote-branch>\n");
 | |
| 
 | |
| static const char *get_upstream_ref(int flags, struct branch *branch, const char *remote_name)
 | |
| {
 | |
| 	if (branch->merge_nr == 0 && (flags & TRANSPORT_PUSH_AUTO_UPSTREAM)) {
 | |
| 		/* if missing, assume same; set_upstream will be defined later */
 | |
| 		return branch->refname;
 | |
| 	}
 | |
| 
 | |
| 	if (!branch->merge_nr || !branch->merge || !branch->remote_name) {
 | |
| 		const char *advice_autosetup_maybe = "";
 | |
| 		if (!(flags & TRANSPORT_PUSH_AUTO_UPSTREAM)) {
 | |
| 			advice_autosetup_maybe = _("\n"
 | |
| 					   "To have this happen automatically for "
 | |
| 					   "branches without a tracking\n"
 | |
| 					   "upstream, see 'push.autoSetupRemote' "
 | |
| 					   "in 'git help config'.\n");
 | |
| 		}
 | |
| 		die(_("The current branch %s has no upstream branch.\n"
 | |
| 		    "To push the current branch and set the remote as upstream, use\n"
 | |
| 		    "\n"
 | |
| 		    "    git push --set-upstream %s %s\n"
 | |
| 		    "%s"),
 | |
| 		    branch->name,
 | |
| 		    remote_name,
 | |
| 		    branch->name,
 | |
| 		    advice_autosetup_maybe);
 | |
| 	}
 | |
| 	if (branch->merge_nr != 1)
 | |
| 		die(_("The current branch %s has multiple upstream branches, "
 | |
| 		    "refusing to push."), branch->name);
 | |
| 
 | |
| 	return branch->merge[0]->src;
 | |
| }
 | |
| 
 | |
| static void setup_default_push_refspecs(int *flags, struct remote *remote)
 | |
| {
 | |
| 	struct branch *branch;
 | |
| 	const char *dst;
 | |
| 	int same_remote;
 | |
| 
 | |
| 	switch (push_default) {
 | |
| 	case PUSH_DEFAULT_MATCHING:
 | |
| 		refspec_append(&rs, ":");
 | |
| 		return;
 | |
| 
 | |
| 	case PUSH_DEFAULT_NOTHING:
 | |
| 		die(_("You didn't specify any refspecs to push, and "
 | |
| 		    "push.default is \"nothing\"."));
 | |
| 		return;
 | |
| 	default:
 | |
| 		break;
 | |
| 	}
 | |
| 
 | |
| 	branch = branch_get(NULL);
 | |
| 	if (!branch)
 | |
| 		die(_(message_detached_head_die), remote->name);
 | |
| 
 | |
| 	dst = branch->refname;
 | |
| 	same_remote = !strcmp(remote->name, remote_for_branch(branch, NULL));
 | |
| 
 | |
| 	switch (push_default) {
 | |
| 	default:
 | |
| 	case PUSH_DEFAULT_UNSPECIFIED:
 | |
| 	case PUSH_DEFAULT_SIMPLE:
 | |
| 		if (!same_remote)
 | |
| 			break;
 | |
| 		if (strcmp(branch->refname, get_upstream_ref(*flags, branch, remote->name)))
 | |
| 			die_push_simple(branch, remote);
 | |
| 		break;
 | |
| 
 | |
| 	case PUSH_DEFAULT_UPSTREAM:
 | |
| 		if (!same_remote)
 | |
| 			die(_("You are pushing to remote '%s', which is not the upstream of\n"
 | |
| 			      "your current branch '%s', without telling me what to push\n"
 | |
| 			      "to update which remote branch."),
 | |
| 			    remote->name, branch->name);
 | |
| 		dst = get_upstream_ref(*flags, branch, remote->name);
 | |
| 		break;
 | |
| 
 | |
| 	case PUSH_DEFAULT_CURRENT:
 | |
| 		break;
 | |
| 	}
 | |
| 
 | |
| 	/*
 | |
| 	 * this is a default push - if auto-upstream is enabled and there is
 | |
| 	 * no upstream defined, then set it (with options 'simple', 'upstream',
 | |
| 	 * and 'current').
 | |
| 	 */
 | |
| 	if ((*flags & TRANSPORT_PUSH_AUTO_UPSTREAM) && branch->merge_nr == 0)
 | |
| 		*flags |= TRANSPORT_PUSH_SET_UPSTREAM;
 | |
| 
 | |
| 	refspec_appendf(&rs, "%s:%s", branch->refname, dst);
 | |
| }
 | |
| 
 | |
| static const char message_advice_pull_before_push[] =
 | |
| 	N_("Updates were rejected because the tip of your current branch is behind\n"
 | |
| 	   "its remote counterpart. If you want to integrate the remote changes,\n"
 | |
| 	   "use 'git pull' before pushing again.\n"
 | |
| 	   "See the 'Note about fast-forwards' in 'git push --help' for details.");
 | |
| 
 | |
| static const char message_advice_checkout_pull_push[] =
 | |
| 	N_("Updates were rejected because a pushed branch tip is behind its remote\n"
 | |
| 	   "counterpart. If you want to integrate the remote changes, use 'git pull'\n"
 | |
| 	   "before pushing again.\n"
 | |
| 	   "See the 'Note about fast-forwards' in 'git push --help' for details.");
 | |
| 
 | |
| static const char message_advice_ref_fetch_first[] =
 | |
| 	N_("Updates were rejected because the remote contains work that you do not\n"
 | |
| 	   "have locally. This is usually caused by another repository pushing to\n"
 | |
| 	   "the same ref. If you want to integrate the remote changes, use\n"
 | |
| 	   "'git pull' before pushing again.\n"
 | |
| 	   "See the 'Note about fast-forwards' in 'git push --help' for details.");
 | |
| 
 | |
| static const char message_advice_ref_already_exists[] =
 | |
| 	N_("Updates were rejected because the tag already exists in the remote.");
 | |
| 
 | |
| static const char message_advice_ref_needs_force[] =
 | |
| 	N_("You cannot update a remote ref that points at a non-commit object,\n"
 | |
| 	   "or update a remote ref to make it point at a non-commit object,\n"
 | |
| 	   "without using the '--force' option.\n");
 | |
| 
 | |
| static const char message_advice_ref_needs_update[] =
 | |
| 	N_("Updates were rejected because the tip of the remote-tracking branch has\n"
 | |
| 	   "been updated since the last checkout. If you want to integrate the\n"
 | |
| 	   "remote changes, use 'git pull' before pushing again.\n"
 | |
| 	   "See the 'Note about fast-forwards' in 'git push --help' for details.");
 | |
| 
 | |
| static void advise_pull_before_push(void)
 | |
| {
 | |
| 	if (!advice_enabled(ADVICE_PUSH_NON_FF_CURRENT) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 | |
| 		return;
 | |
| 	advise(_(message_advice_pull_before_push));
 | |
| }
 | |
| 
 | |
| static void advise_checkout_pull_push(void)
 | |
| {
 | |
| 	if (!advice_enabled(ADVICE_PUSH_NON_FF_MATCHING) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 | |
| 		return;
 | |
| 	advise(_(message_advice_checkout_pull_push));
 | |
| }
 | |
| 
 | |
| static void advise_ref_already_exists(void)
 | |
| {
 | |
| 	if (!advice_enabled(ADVICE_PUSH_ALREADY_EXISTS) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 | |
| 		return;
 | |
| 	advise(_(message_advice_ref_already_exists));
 | |
| }
 | |
| 
 | |
| static void advise_ref_fetch_first(void)
 | |
| {
 | |
| 	if (!advice_enabled(ADVICE_PUSH_FETCH_FIRST) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 | |
| 		return;
 | |
| 	advise(_(message_advice_ref_fetch_first));
 | |
| }
 | |
| 
 | |
| static void advise_ref_needs_force(void)
 | |
| {
 | |
| 	if (!advice_enabled(ADVICE_PUSH_NEEDS_FORCE) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 | |
| 		return;
 | |
| 	advise(_(message_advice_ref_needs_force));
 | |
| }
 | |
| 
 | |
| static void advise_ref_needs_update(void)
 | |
| {
 | |
| 	if (!advice_enabled(ADVICE_PUSH_REF_NEEDS_UPDATE) || !advice_enabled(ADVICE_PUSH_UPDATE_REJECTED))
 | |
| 		return;
 | |
| 	advise(_(message_advice_ref_needs_update));
 | |
| }
 | |
| 
 | |
| static int push_with_options(struct transport *transport, struct refspec *rs,
 | |
| 			     int flags)
 | |
| {
 | |
| 	int err;
 | |
| 	unsigned int reject_reasons;
 | |
| 	char *anon_url = transport_anonymize_url(transport->url);
 | |
| 
 | |
| 	transport_set_verbosity(transport, verbosity, progress);
 | |
| 	transport->family = family;
 | |
| 
 | |
| 	if (receivepack)
 | |
| 		transport_set_option(transport,
 | |
| 				     TRANS_OPT_RECEIVEPACK, receivepack);
 | |
| 	transport_set_option(transport, TRANS_OPT_THIN, thin ? "yes" : NULL);
 | |
| 
 | |
| 	if (!is_empty_cas(&cas)) {
 | |
| 		if (!transport->smart_options)
 | |
| 			die("underlying transport does not support --%s option",
 | |
| 			    "force-with-lease");
 | |
| 		transport->smart_options->cas = &cas;
 | |
| 	}
 | |
| 
 | |
| 	if (verbosity > 0)
 | |
| 		fprintf(stderr, _("Pushing to %s\n"), anon_url);
 | |
| 	trace2_region_enter("push", "transport_push", the_repository);
 | |
| 	err = transport_push(the_repository, transport,
 | |
| 			     rs, flags, &reject_reasons);
 | |
| 	trace2_region_leave("push", "transport_push", the_repository);
 | |
| 	if (err != 0) {
 | |
| 		fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR));
 | |
| 		error(_("failed to push some refs to '%s'"), anon_url);
 | |
| 		fprintf(stderr, "%s", push_get_color(PUSH_COLOR_RESET));
 | |
| 	}
 | |
| 
 | |
| 	err |= transport_disconnect(transport);
 | |
| 	free(anon_url);
 | |
| 	if (!err)
 | |
| 		return 0;
 | |
| 
 | |
| 	if (reject_reasons & REJECT_NON_FF_HEAD) {
 | |
| 		advise_pull_before_push();
 | |
| 	} else if (reject_reasons & REJECT_NON_FF_OTHER) {
 | |
| 		advise_checkout_pull_push();
 | |
| 	} else if (reject_reasons & REJECT_ALREADY_EXISTS) {
 | |
| 		advise_ref_already_exists();
 | |
| 	} else if (reject_reasons & REJECT_FETCH_FIRST) {
 | |
| 		advise_ref_fetch_first();
 | |
| 	} else if (reject_reasons & REJECT_NEEDS_FORCE) {
 | |
| 		advise_ref_needs_force();
 | |
| 	} else if (reject_reasons & REJECT_REF_NEEDS_UPDATE) {
 | |
| 		advise_ref_needs_update();
 | |
| 	}
 | |
| 
 | |
| 	return 1;
 | |
| }
 | |
| 
 | |
| static int do_push(int flags,
 | |
| 		   const struct string_list *push_options,
 | |
| 		   struct remote *remote)
 | |
| {
 | |
| 	int i, errs;
 | |
| 	struct strvec *url;
 | |
| 	struct refspec *push_refspec = &rs;
 | |
| 
 | |
| 	if (push_options->nr)
 | |
| 		flags |= TRANSPORT_PUSH_OPTIONS;
 | |
| 
 | |
| 	if (!push_refspec->nr && !(flags & TRANSPORT_PUSH_ALL)) {
 | |
| 		if (remote->push.nr) {
 | |
| 			push_refspec = &remote->push;
 | |
| 		} else if (!(flags & TRANSPORT_PUSH_MIRROR))
 | |
| 			setup_default_push_refspecs(&flags, remote);
 | |
| 	}
 | |
| 	errs = 0;
 | |
| 	url = push_url_of_remote(remote);
 | |
| 	for (i = 0; i < url->nr; i++) {
 | |
| 		struct transport *transport =
 | |
| 			transport_get(remote, url->v[i]);
 | |
| 		if (flags & TRANSPORT_PUSH_OPTIONS)
 | |
| 			transport->push_options = push_options;
 | |
| 		if (push_with_options(transport, push_refspec, flags))
 | |
| 			errs++;
 | |
| 	}
 | |
| 	return !!errs;
 | |
| }
 | |
| 
 | |
| static int option_parse_recurse_submodules(const struct option *opt,
 | |
| 				   const char *arg, int unset)
 | |
| {
 | |
| 	int *recurse_submodules = opt->value;
 | |
| 
 | |
| 	if (unset)
 | |
| 		*recurse_submodules = RECURSE_SUBMODULES_OFF;
 | |
| 	else {
 | |
| 		if (!strcmp(arg, "only-is-on-demand")) {
 | |
| 			if (*recurse_submodules == RECURSE_SUBMODULES_ONLY) {
 | |
| 				warning(_("recursing into submodule with push.recurseSubmodules=only; using on-demand instead"));
 | |
| 				*recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
 | |
| 			}
 | |
| 		} else {
 | |
| 			*recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg);
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static void set_push_cert_flags(int *flags, int v)
 | |
| {
 | |
| 	switch (v) {
 | |
| 	case SEND_PACK_PUSH_CERT_NEVER:
 | |
| 		*flags &= ~(TRANSPORT_PUSH_CERT_ALWAYS | TRANSPORT_PUSH_CERT_IF_ASKED);
 | |
| 		break;
 | |
| 	case SEND_PACK_PUSH_CERT_ALWAYS:
 | |
| 		*flags |= TRANSPORT_PUSH_CERT_ALWAYS;
 | |
| 		*flags &= ~TRANSPORT_PUSH_CERT_IF_ASKED;
 | |
| 		break;
 | |
| 	case SEND_PACK_PUSH_CERT_IF_ASKED:
 | |
| 		*flags |= TRANSPORT_PUSH_CERT_IF_ASKED;
 | |
| 		*flags &= ~TRANSPORT_PUSH_CERT_ALWAYS;
 | |
| 		break;
 | |
| 	}
 | |
| }
 | |
| 
 | |
| 
 | |
| static int git_push_config(const char *k, const char *v,
 | |
| 			   const struct config_context *ctx, void *cb)
 | |
| {
 | |
| 	const char *slot_name;
 | |
| 	int *flags = cb;
 | |
| 
 | |
| 	if (!strcmp(k, "push.followtags")) {
 | |
| 		if (git_config_bool(k, v))
 | |
| 			*flags |= TRANSPORT_PUSH_FOLLOW_TAGS;
 | |
| 		else
 | |
| 			*flags &= ~TRANSPORT_PUSH_FOLLOW_TAGS;
 | |
| 		return 0;
 | |
| 	} else if (!strcmp(k, "push.autosetupremote")) {
 | |
| 		if (git_config_bool(k, v))
 | |
| 			*flags |= TRANSPORT_PUSH_AUTO_UPSTREAM;
 | |
| 		return 0;
 | |
| 	} else if (!strcmp(k, "push.gpgsign")) {
 | |
| 		switch (git_parse_maybe_bool(v)) {
 | |
| 		case 0:
 | |
| 			set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_NEVER);
 | |
| 			break;
 | |
| 		case 1:
 | |
| 			set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_ALWAYS);
 | |
| 			break;
 | |
| 		default:
 | |
| 			if (!strcasecmp(v, "if-asked"))
 | |
| 				set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_IF_ASKED);
 | |
| 			else
 | |
| 				return error(_("invalid value for '%s'"), k);
 | |
| 		}
 | |
| 	} else if (!strcmp(k, "push.recursesubmodules")) {
 | |
| 		recurse_submodules = parse_push_recurse_submodules_arg(k, v);
 | |
| 	} else if (!strcmp(k, "submodule.recurse")) {
 | |
| 		int val = git_config_bool(k, v) ?
 | |
| 			RECURSE_SUBMODULES_ON_DEMAND : RECURSE_SUBMODULES_OFF;
 | |
| 		recurse_submodules = val;
 | |
| 	} else if (!strcmp(k, "push.pushoption")) {
 | |
| 		return parse_transport_option(k, v, &push_options_config);
 | |
| 	} else if (!strcmp(k, "color.push")) {
 | |
| 		push_use_color = git_config_colorbool(k, v);
 | |
| 		return 0;
 | |
| 	} else if (skip_prefix(k, "color.push.", &slot_name)) {
 | |
| 		int slot = parse_push_color_slot(slot_name);
 | |
| 		if (slot < 0)
 | |
| 			return 0;
 | |
| 		if (!v)
 | |
| 			return config_error_nonbool(k);
 | |
| 		return color_parse(v, push_colors[slot]);
 | |
| 	} else if (!strcmp(k, "push.useforceifincludes")) {
 | |
| 		if (git_config_bool(k, v))
 | |
| 			*flags |= TRANSPORT_PUSH_FORCE_IF_INCLUDES;
 | |
| 		else
 | |
| 			*flags &= ~TRANSPORT_PUSH_FORCE_IF_INCLUDES;
 | |
| 		return 0;
 | |
| 	}
 | |
| 
 | |
| 	return git_default_config(k, v, ctx, NULL);
 | |
| }
 | |
| 
 | |
| int cmd_push(int argc,
 | |
| 	     const char **argv,
 | |
| 	     const char *prefix,
 | |
| 	     struct repository *repository UNUSED)
 | |
| {
 | |
| 	int flags = 0;
 | |
| 	int tags = 0;
 | |
| 	int push_cert = -1;
 | |
| 	int rc;
 | |
| 	const char *repo = NULL;	/* default repository */
 | |
| 	struct string_list push_options_cmdline = STRING_LIST_INIT_DUP;
 | |
| 	struct string_list *push_options;
 | |
| 	const struct string_list_item *item;
 | |
| 	struct remote *remote;
 | |
| 
 | |
| 	struct option options[] = {
 | |
| 		OPT__VERBOSITY(&verbosity),
 | |
| 		OPT_STRING( 0 , "repo", &repo, N_("repository"), N_("repository")),
 | |
| 		OPT_BIT( 0 , "all", &flags, N_("push all branches"), TRANSPORT_PUSH_ALL),
 | |
| 		OPT_ALIAS( 0 , "branches", "all"),
 | |
| 		OPT_BIT( 0 , "mirror", &flags, N_("mirror all refs"),
 | |
| 			    (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE)),
 | |
| 		OPT_BOOL('d', "delete", &deleterefs, N_("delete refs")),
 | |
| 		OPT_BOOL( 0 , "tags", &tags, N_("push tags (can't be used with --all or --branches or --mirror)")),
 | |
| 		OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN),
 | |
| 		OPT_BIT( 0,  "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),
 | |
| 		OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE),
 | |
| 		OPT_CALLBACK_F(0, "force-with-lease", &cas, N_("<refname>:<expect>"),
 | |
| 			       N_("require old value of ref to be at this value"),
 | |
| 			       PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option),
 | |
| 		OPT_BIT(0, TRANS_OPT_FORCE_IF_INCLUDES, &flags,
 | |
| 			N_("require remote updates to be integrated locally"),
 | |
| 			TRANSPORT_PUSH_FORCE_IF_INCLUDES),
 | |
| 		OPT_CALLBACK(0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)",
 | |
| 			     N_("control recursive pushing of submodules"), option_parse_recurse_submodules),
 | |
| 		OPT_BOOL_F( 0 , "thin", &thin, N_("use thin pack"), PARSE_OPT_NOCOMPLETE),
 | |
| 		OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")),
 | |
| 		OPT_STRING( 0 , "exec", &receivepack, "receive-pack", N_("receive pack program")),
 | |
| 		OPT_BIT('u', "set-upstream", &flags, N_("set upstream for git pull/status"),
 | |
| 			TRANSPORT_PUSH_SET_UPSTREAM),
 | |
| 		OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
 | |
| 		OPT_BIT(0, "prune", &flags, N_("prune locally removed refs"),
 | |
| 			TRANSPORT_PUSH_PRUNE),
 | |
| 		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_CALLBACK_F(0, "signed", &push_cert, "(yes|no|if-asked)", N_("GPG sign the push"),
 | |
| 				PARSE_OPT_OPTARG, option_parse_push_signed),
 | |
| 		OPT_BIT(0, "atomic", &flags, N_("request atomic transaction on remote side"), TRANSPORT_PUSH_ATOMIC),
 | |
| 		OPT_STRING_LIST('o', "push-option", &push_options_cmdline, N_("server-specific"), N_("option to transmit")),
 | |
| 		OPT_IPVERSION(&family),
 | |
| 		OPT_END()
 | |
| 	};
 | |
| 
 | |
| 	packet_trace_identity("push");
 | |
| 	git_config(git_push_config, &flags);
 | |
| 	argc = parse_options(argc, argv, prefix, options, push_usage, 0);
 | |
| 	push_options = (push_options_cmdline.nr
 | |
| 		? &push_options_cmdline
 | |
| 		: &push_options_config);
 | |
| 	set_push_cert_flags(&flags, push_cert);
 | |
| 
 | |
| 	die_for_incompatible_opt4(deleterefs, "--delete",
 | |
| 				  tags, "--tags",
 | |
| 				  flags & TRANSPORT_PUSH_ALL, "--all/--branches",
 | |
| 				  flags & TRANSPORT_PUSH_MIRROR, "--mirror");
 | |
| 	if (deleterefs && argc < 2)
 | |
| 		die(_("--delete doesn't make sense without any refs"));
 | |
| 
 | |
| 	if (recurse_submodules == RECURSE_SUBMODULES_CHECK)
 | |
| 		flags |= TRANSPORT_RECURSE_SUBMODULES_CHECK;
 | |
| 	else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
 | |
| 		flags |= TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND;
 | |
| 	else if (recurse_submodules == RECURSE_SUBMODULES_ONLY)
 | |
| 		flags |= TRANSPORT_RECURSE_SUBMODULES_ONLY;
 | |
| 
 | |
| 	if (tags)
 | |
| 		refspec_append(&rs, "refs/tags/*");
 | |
| 
 | |
| 	if (argc > 0)
 | |
| 		repo = argv[0];
 | |
| 
 | |
| 	remote = pushremote_get(repo);
 | |
| 	if (!remote) {
 | |
| 		if (repo)
 | |
| 			die(_("bad repository '%s'"), repo);
 | |
| 		die(_("No configured push destination.\n"
 | |
| 		    "Either specify the URL from the command-line or configure a remote repository using\n"
 | |
| 		    "\n"
 | |
| 		    "    git remote add <name> <url>\n"
 | |
| 		    "\n"
 | |
| 		    "and then push using the remote name\n"
 | |
| 		    "\n"
 | |
| 		    "    git push <name>\n"));
 | |
| 	}
 | |
| 
 | |
| 	if (argc > 0)
 | |
| 		set_refspecs(argv + 1, argc - 1, remote);
 | |
| 
 | |
| 	if (remote->mirror)
 | |
| 		flags |= (TRANSPORT_PUSH_MIRROR|TRANSPORT_PUSH_FORCE);
 | |
| 
 | |
| 	if (flags & TRANSPORT_PUSH_ALL) {
 | |
| 		if (argc >= 2)
 | |
| 			die(_("--all can't be combined with refspecs"));
 | |
| 	}
 | |
| 	if (flags & TRANSPORT_PUSH_MIRROR) {
 | |
| 		if (argc >= 2)
 | |
| 			die(_("--mirror can't be combined with refspecs"));
 | |
| 	}
 | |
| 
 | |
| 	if (!is_empty_cas(&cas) && (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES))
 | |
| 		cas.use_force_if_includes = 1;
 | |
| 
 | |
| 	for_each_string_list_item(item, push_options)
 | |
| 		if (strchr(item->string, '\n'))
 | |
| 			die(_("push options must not have new line characters"));
 | |
| 
 | |
| 	rc = do_push(flags, push_options, remote);
 | |
| 	string_list_clear(&push_options_cmdline, 0);
 | |
| 	string_list_clear(&push_options_config, 0);
 | |
| 	clear_cas_option(&cas);
 | |
| 	if (rc == -1)
 | |
| 		usage_with_options(push_usage, options);
 | |
| 	else
 | |
| 		return rc;
 | |
| }
 |