Re: [PATCH] test: pull: add test for disabling pull.ff=only

From: Bagas Sanjaya <bagasdotme@gmail.com>
Date: Jul 12, 2021, 04:42 UTC
Message-ID: <ef5ca2bf-3a7a-aa9e-40a2-6b1fe04e323e@gmail.com>
In-Reply-To: <20210711170703.651081-1-felipe.contreras@gmail.com>

On 12/07/21 00.07, Felipe Contreras wrote:

Show 9 quoted lines

> 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?

Show 6 quoted lines

> +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