From: Abhradeep Chakraborty <chakrabortyabhradeep79@gmail.com>
To: git@vger.kernel.org
Cc: Abhradeep Chakraborty <chakrabortyabhradeep79@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Philip Oakley <philipoakley@iee.email>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v3 0/1] making --set-upstream have default arguments
Date: Thu, 9 Dec 2021 15:45:49 +0530 [thread overview]
Message-ID: <20211209101550.19582-1-chakrabortyabhradeep79@gmail.com> (raw)
In-Reply-To: <20211207182300.4361-1-chakrabortyabhradeep79@gmail.com>
This patch series tries to make the 'set-upstream' option for
'git push' have default arguments.
In v0: argumentless 'git push -u' was blindly passing default remote
name and current branch's name as argv[0] and argv[1] respectively.
This was affecting `push.default` setting.
From v1: The default remote is still used for the <repository> value.
But <refspec> depends on the current push configurations. If
`push.default`='matching', it pushes to the upstream as it should and
sets upstream respectively. For other values of 'push.default', it
pushes to the remote branch with the same name as the current
branch and sets that branch as the upstream.
In this version, the tests are improved.
Abhradeep Chakraborty (1):
push: make '-u' have default arguments
Documentation/git-push.txt | 10 +++++
builtin/push.c | 11 ++++-
t/t5523-push-upstream.sh | 87 ++++++++++++++++++++++++++++++++++++++
3 files changed, 106 insertions(+), 2 deletions(-)
Range-diff against v2:
1: 6567327900 ! 1: 376ba6cb8f push: make '-u' have default arguments
@@ Documentation/git-push.txt: Specifying `--no-force-if-includes` disables this be
+If `push.default` is set to `matching`, all remote branches to which
+local branches pushed, will be set as upstream of respective local
+branches. For all other values of `push.default`, current branch's
-+`<refspec>` will be used as the `<refspec>`.
++refspec will be used as the `<refspec>`.
--[no-]thin::
These options are passed to linkgit:git-send-pack[1]. A thin transfer
@@ t/t5523-push-upstream.sh: test_expect_success 'push -u :topic_2' '
'
+default_u_setup() {
-+ git checkout main
-+ remote=$(git config --get branch.main.remote)
-+ if [ ! -z "$remote" ]; then
-+ git branch --unset-upstream
-+ fi
-+ git config push.default $1
-+ git config remote.pushDefault upstream
++ git checkout main &&
++ test_might_fail git branch --unset-upstream &&
++ test_config push.default $1 &&
++ test_config remote.pushDefault upstream
+}
+
-+test_expect_success 'push -u with push.default=simple' '
-+ default_u_setup simple &&
-+ 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 with push.default=current' '
-+ default_u_setup current &&
-+ 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 with push.default=upstream' '
-+ default_u_setup upstream &&
-+ 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
-+'
++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
++ '
++done
+
+check_empty_config() {
-+ test_expect_code 1 git config "branch.$1.remote"
++ test_expect_code 1 git config "branch.$1.remote" &&
+ test_expect_code 1 git config "branch.$1.merge"
+}
+
@@ t/t5523-push-upstream.sh: test_expect_success 'push -u :topic_2' '
+ check_empty_config test_u
+'
+
-+test_expect_success 'push -u with push.default=nothing' '
-+ default_u_setup nothing &&
-+ 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 --dry-run' '
+ git checkout main &&
+ git push -u upstream main:other &&
@@ t/t5523-push-upstream.sh: test_expect_success TTY 'progress messages go to tty'
+test_expect_success TTY 'progress messages go to tty with default -u' '
+ ensure_fresh_upstream &&
+
-+ test_terminal git push -u >out 2>err &&
++ test_terminal git push -u 2>err &&
+ test_i18ngrep "Writing objects" err
+'
+
@@ t/t5523-push-upstream.sh: test_expect_success 'progress messages do not go to no
test_i18ngrep ! "Writing objects" err
'
-+test_expect_success 'progress messagesdo not go to non-tty (default -u)' '
++test_expect_success 'progress messages do not go to non-tty (default -u)' '
+ ensure_fresh_upstream &&
+
+ # skip progress messages, since stderr is non-tty
-+ git push -u >out 2>err &&
++ git push -u 2>err &&
+ test_i18ngrep ! "Writing objects" err
+'
+
@@ t/t5523-push-upstream.sh: test_expect_success 'progress messages go to non-tty (
+ ensure_fresh_upstream &&
+
+ # force progress messages to stderr, even though it is non-tty
-+ git push -u --progress >out 2>err &&
++ git push -u --progress 2>err &&
+ test_i18ngrep "Writing objects" err
+'
+
@@ t/t5523-push-upstream.sh: test_expect_success TTY 'push -q suppresses progress'
+test_expect_success TTY 'push -q suppresses progress (with default -u)' '
+ ensure_fresh_upstream &&
+
-+ test_terminal git push -u -q >out 2>err &&
++ test_terminal git push -u -q 2>err &&
+ test_i18ngrep ! "Writing objects" err
+'
+
@@ t/t5523-push-upstream.sh: test_expect_success TTY 'push --no-progress suppresses
+test_expect_success TTY 'push --no-progress suppresses progress (default -u)' '
+ ensure_fresh_upstream &&
+
-+ test_terminal git push -u --no-progress >out 2>err &&
++ test_terminal git push -u --no-progress 2>err &&
+ test_i18ngrep ! "Unpacking objects" err &&
+ test_i18ngrep ! "Writing objects" err
+'
--
2.34.1
next prev parent reply other threads:[~2021-12-09 10:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 14:43 [RFC PATCH 0/1] making --set-upstream have default arguments Abhradeep Chakraborty
2021-12-02 14:43 ` [RFC PATCH 1/1] push: make '-u' " Abhradeep Chakraborty
2021-12-02 18:24 ` Junio C Hamano
2021-12-03 8:14 ` Abhradeep Chakraborty
2021-12-03 17:29 ` Junio C Hamano
2021-12-03 19:27 ` Abhradeep Chakraborty
2021-12-03 11:32 ` [RFC PATCH 0/1] making --set-upstream " Philip Oakley
2021-12-03 16:03 ` Abhradeep Chakraborty
2021-12-03 16:46 ` Philip Oakley
2021-12-03 17:28 ` Abhradeep Chakraborty
2021-12-07 18:22 ` [PATCH v2 " Abhradeep Chakraborty
2021-12-07 18:23 ` [PATCH v2 1/1] push: make '-u' " Abhradeep Chakraborty
2021-12-07 22:14 ` Eric Sunshine
2021-12-08 6:12 ` [PATCH v2 1/1] push: make '-u' have default argument Abhradeep Chakraborty
2021-12-09 10:15 ` Abhradeep Chakraborty [this message]
2021-12-09 10:15 ` [PATCH v3 1/1] push: make '-u' have default arguments Abhradeep Chakraborty
2022-01-01 14:37 ` [PATCH v4 0/1] making --set-upstream " Abhradeep Chakraborty
2022-01-01 14:37 ` [PATCH v4 1/1] push: make 'set-upstream' have dafault arguments Abhradeep Chakraborty
2022-01-04 3:46 ` Junio C Hamano
2022-01-04 13:28 ` Abhradeep Chakraborty
2022-01-04 20:35 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211209101550.19582-1-chakrabortyabhradeep79@gmail.com \
--to=chakrabortyabhradeep79@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.email \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).