From: John Cai <johncai86@gmail.com>
To: git@vger.kernel.org
Cc: John Cai <johncai86@gmail.com>
Subject: [PATCH 0/1] Fix bug in pull --rebase not recognizing rebase.autostash
Date: Tue, 4 Jan 2022 16:45:21 -0500 [thread overview]
Message-ID: <20220104214522.10692-1-johncai86@gmail.com> (raw)
NOTE: this is my first patch I'm submitting through git send-email. Please let
me know if there is some convention that I'm missing. thank you in advance :)
A bug in pull.c causes merge and rebase functions to ignore
rebase.autostash if it is only set in the config.
There are a couple of different scenarios that we need to be mindful of:
--autostash passed in through command line
$ git pull --autostash
merge/rebase should get --autostashed passed through
--rebase passed in, rebase.autostash set in config
$ git config rebase.autostash true
$ git pull --rebase
merge/rebase should get --autostash from config
--no-autostash passed in
$ git pull --no-autostash
--no-autostash should be passed into merge/rebase
rebase.autostash set but --rebase not used
$ git config rebase.autostash true
$ git pull
--autostash should not be passed into merge but not rebase
This change adjusts variable names to make it more clear which autostash
setting it is modifying, and ensures --autostash is passed into the
merge/rebase where appropriate.
John Cai (1):
builtin/pull.c: use config value of autostash
builtin/pull.c | 15 ++++++------
t/t5521-pull-options.sh | 51 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 59 insertions(+), 7 deletions(-)
--
2.34.1
next reply other threads:[~2022-01-04 21:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-04 21:45 John Cai [this message]
2022-01-04 21:45 ` [PATCH 1/1] builtin/pull.c: use config value of autostash John Cai
2022-01-04 22:46 ` Junio C Hamano
2022-01-05 3:58 ` Philippe Blain
2022-01-06 19:11 ` Junio C Hamano
2022-01-14 0:00 ` Junio C Hamano
2022-01-14 3:14 ` Philippe Blain
2022-01-14 14:09 ` John Cai
2022-01-14 19:40 ` Junio C Hamano
2022-01-14 23:33 ` Philippe Blain
2022-01-05 11:21 ` Phillip Wood
2022-01-05 3:40 ` Philippe Blain
2022-01-05 4:02 ` Philippe Blain
2022-01-05 15:50 ` Johannes Schindelin
2022-01-04 23:32 ` [PATCH 0/1] Fix bug in pull --rebase not recognizing rebase.autostash Philippe Blain
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=20220104214522.10692-1-johncai86@gmail.com \
--to=johncai86@gmail.com \
--cc=git@vger.kernel.org \
/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).