git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] pull: do not warn when opt_ff is explicitly specified

From
Alex Henrie <alexhenrie24@gmail.com>
Date
Sep 23, 2020, 18:33 UTC
Message-ID
<CAMMLpeR=g6gfjokxpmcj5kfnJxPO-ZLTUpa_QMT_oAcQQ6AR=Q@mail.gmail.com>
In-Reply-To
<CAMMLpeRD6hKuAHjHh2AXrx1PVXHx7m9haUPAR_uNHR=YuT5xbQ@mail.gmail.com>
On Wed, Sep 23, 2020 at 12:25 PM Alex Henrie <alexhenrie24@gmail.com> wrote:
Show 7 quoted lines
>
> 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
Previous: Alex Henrie
Message 4 of 4 in “pull: do not warn when opt_ff is explicitly specified”
  1. pull: do not warn when opt_ff is explicitly specifiedDenton Liu, Sep 23, 2020
  2. Junio C HamanoSep 23, 2020
  3. Alex HenrieSep 23, 2020
  4. Alex HenrieSep 23, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.