On Wed, Sep 23, 2020 at 12:25 PM Alex Henrie <alexhenrie24@xxxxxxxxx> wrote: > > Hi Denton, thanks for working on this! We can also assume that the > user knows what they are doing and does not need a warning if they > have run `git config --global pull.ff no`. So really, we can just get > rid of the check for strcmp(opt_ff, "--ff-only") altogether and > instead only check !opt_ff. Could you do that and add some more tests > to t5521-pull-options.sh? Actually, never mind, I'll send the patch myself. When I originally put in the warning I didn't stop to think that if the user is proficient enough to set pull.ff to any value, they really don't need a warning. -Alex
