From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>, git@vger.kernel.org
Cc: Alex Henrie <alexhenrie24@gmail.com>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] test: pull: add test for disabling pull.ff=only
Date: Mon, 12 Jul 2021 11:42:34 +0700 [thread overview]
Message-ID: <ef5ca2bf-3a7a-aa9e-40a2-6b1fe04e323e@gmail.com> (raw)
In-Reply-To: <20210711170703.651081-1-felipe.contreras@gmail.com>
On 12/07/21 00.07, Felipe Contreras wrote:
> The advice clearly says it should be possible to override pull.ff=only
> with --rebase:
>
> You can also pass --rebase, --no-rebase, or --ff-only on the command
> line to override the configured default per invocation.
>
> Since the intended behavior of `git pull` is very easily forgotten let's
> add a test to make sure it isn't.
>
Is pull.ff=only only do fast-forward merge when pulling?
> +test_expect_success 'pull allows non-fast-forward with "only" in pull.ff if --rebase' '
> + git reset --hard c1 &&
> + test_config pull.ff only &&
> + git pull --rebase . c3
> +'
> +
Better say 'pull allows non-fast-forward (using --rebase) regardless of
pull.ff=only config'
--
An old man doll... just what I always wanted! - Clara
next prev parent reply other threads:[~2021-07-12 4:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-11 17:07 [PATCH] test: pull: add test for disabling pull.ff=only Felipe Contreras
2021-07-12 4:42 ` Bagas Sanjaya [this message]
2021-07-12 5:34 ` Felipe Contreras
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=ef5ca2bf-3a7a-aa9e-40a2-6b1fe04e323e@gmail.com \
--to=bagasdotme@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).