git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 1/1] push: make 'set-upstream' have dafault arguments

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 4, 2022, 03:46 UTC
Message-ID
<xmqqy23wduxp.fsf@gitster.g>
In-Reply-To
<20220101143748.2582-2-chakrabortyabhradeep79@gmail.com>
Abhradeep Chakraborty <chakrabortyabhradeep79@gmail.com> writes:
Show 5 quoted lines
> Teach "git push -u" not to require repository and refspec.  When
> the user do not give what repository to push to, or which
> branch(es) to push, behave as if the default remote repository
> and a refspec (depending on the "push.default" configuration)
> are given.

That means if the user says push.default==nothing, we should error out "git push -u" as before, but that is not what the change to setup_default_push_refspecs() function does, is it?

Show 35 quoted lines
> -static void setup_default_push_refspecs(struct remote *remote)
> +static void setup_default_push_refspecs(struct remote *remote, int flags)
>  {
>  	struct branch *branch;
>  	const char *dst;
>  	int same_remote;
> +	int is_default_u = (flags & TRANSPORT_PUSH_SET_UPSTREAM);
>  
>  	switch (push_default) {
>  	case PUSH_DEFAULT_MATCHING:
> @@ -214,6 +215,8 @@ static void setup_default_push_refspecs(struct remote *remote)
>  		return;
>  
>  	case PUSH_DEFAULT_NOTHING:
> +		if (is_default_u)
> +			break;
>  		die(_("You didn't specify any refspecs to push, and "
>  		    "push.default is \"nothing\"."));
>  		return;
> @@ -234,11 +237,15 @@ static void setup_default_push_refspecs(struct remote *remote)
>  	case PUSH_DEFAULT_SIMPLE:
>  		if (!same_remote)
>  			break;
> +		if (is_default_u)
> +			break;
>  		if (strcmp(branch->refname, get_upstream_ref(branch, remote->name)))
>  			die_push_simple(branch, remote);
>  		break;
>  
>  	case PUSH_DEFAULT_UPSTREAM:
> +		if (is_default_u)
> +			break;
>  		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"

So, I am not sure if many of the above changes are sensible. The first one certainly does not sound like sensible.

Show 9 quoted lines
> diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
> index fdb4292056..c2d11c3f2a 100755
> --- a/t/t5523-push-upstream.sh
> +++ b/t/t5523-push-upstream.sh
> @@ -60,6 +60,86 @@ test_expect_success 'push -u :topic_2' '
>  	check_config topic_2 upstream refs/heads/other2
>  '
>  
> +default_u_setup() {
Style. (cf. Documentation/CodingGuildelines).
Show 7 quoted lines
> +	git checkout main &&
> +	test_might_fail	git branch --unset-upstream &&
> +	test_config push.default $1 &&
> +	test_config remote.pushDefault upstream
> +}
> +
> +check_empty_config() {
Likewise.
Show 48 quoted lines
> +	test_expect_code 1 git config "branch.$1.remote" &&
> +	test_expect_code 1 git config "branch.$1.merge"
> +}
> +
> +for i in simple current upstream nothing
> +do
> +	test_expect_success 'push -u with push.default=$i' '
> +		default_u_setup $i &&
> +		git push -u &&
> +		check_config main upstream refs/heads/main &&
> +		git push -u upstream main:other &&
> +		git push -u &&
> +		check_config main upstream refs/heads/main
> +	'
> +
> +	test_expect_success 'push -u -f with push.default=$i' '
> +		default_u_setup $i &&
> +		git push -u -f &&
> +		check_config main upstream refs/heads/main
> +	'
> +done
> +
> +for i in simple current upstream nothing matching
> +do
> +	test_expect_success 'push -u --prune with push.default=$i' '
> +		default_u_setup $i &&
> +		git push upstream main:test_u215 &&
> +		git push -u --prune >out &&
> +		check_config main upstream refs/heads/main &&
> +		test_i18ngrep "[deleted]" out &&
> +		test_i18ngrep ! "Branch '"'"'test_u215'"'"' set up to track" out
> +	'
> +
> +	test_expect_success 'push -u --mirror with push.default=$i' '
> +		default_u_setup $i &&
> +		test_might_fail git branch mirror1 &&
> +		test_might_fail git branch mirror2 &&
> +		git push -u --mirror &&
> +		check_config main upstream  refs/heads/main &&
> +		check_config mirror1 upstream refs/heads/mirror1 &&
> +		check_config mirror2 upstream refs/heads/mirror2
> +	'
> +done
> +
> +for i in '' '-f'
> +do
> +
> +	test_expect_success 'push -u $i with push.default=matching' '

Doesn't $i show in the output as-is here? Quote the test title in double-quotes, while using single-qoutes around the test body.

Show 11 quoted lines
> +		default_u_setup matching &&
> +		test_might_fail git branch test_u &&
> +		test_might_fail git branch test_u2 &&
> +		git push upstream main:test_u2 &&
> +		git push -u $i &&
> +		check_config main upstream refs/heads/main &&
> +		check_config test_u2 upstream refs/heads/test_u2 &&
> +		check_empty_config test_u
> +	'
> +done
> +
Previous: Abhradeep ChakrabortyNext: Abhradeep Chakraborty
Message 19 of 21 in “making --set-upstream have default arguments”
  1. 0/1 making --set-upstream have default argumentsAbhradeep Chakraborty, Dec 2, 2021
  2. 1/1 push: make '-u' have default argumentsAbhradeep Chakraborty, Dec 2, 2021
  3. Junio C HamanoDec 2, 2021
  4. Abhradeep ChakrabortyDec 3, 2021
  5. Junio C HamanoDec 3, 2021
  6. Abhradeep ChakrabortyDec 3, 2021
  7. Philip OakleyDec 3, 2021
  8. Abhradeep ChakrabortyDec 3, 2021
  9. Philip OakleyDec 3, 2021
  10. Abhradeep ChakrabortyDec 3, 2021
  11. 0/1 making --set-upstream have default argumentsAbhradeep Chakraborty, Dec 7, 2021
  12. 1/1 push: make '-u' have default argumentsAbhradeep Chakraborty, Dec 7, 2021
  13. Eric SunshineDec 7, 2021
  14. Abhradeep ChakrabortyDec 8, 2021
  15. 0/1 making --set-upstream have default argumentsAbhradeep Chakraborty, Dec 9, 2021
  16. 1/1 push: make '-u' have default argumentsAbhradeep Chakraborty, Dec 9, 2021
  17. 0/1 making --set-upstream have default argumentsAbhradeep Chakraborty, Jan 1, 2022
  18. 1/1 push: make 'set-upstream' have dafault argumentsAbhradeep Chakraborty, Jan 1, 2022
  19. Junio C HamanoJan 4, 2022
  20. Abhradeep ChakrabortyJan 4, 2022
  21. Junio C HamanoJan 4, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.