On Mon, Nov 23, 2020 at 04:55:31PM -0600, Felipe Contreras wrote:
> On Mon, Nov 23, 2020 at 3:48 PM Jeff King <peff@xxxxxxxx> wrote:
> > On Mon, Nov 23, 2020 at 02:34:18PM -0600, Felipe Contreras wrote:
>
> > > There has never been a "pull.mode=ff-only" option; that's what I tried
> > > to introduce.
> >
> > There is pull.ff=only these days, which also squelches the message. But
> > you're right that it was never the default.
>
> But that's not the same thing. The whole point of "pull.mode=ff-only"
> was to print a message like:
>
> The pull was not fast-forward, please either merge or rebase.
Perhaps I don't understand the distinction you are making. I have
pull.ff=ff set, and I get:
$ git pull
remote: Enumerating objects: 1, done.
remote: Counting objects: 100% (1/1), done.
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (1/1), done.
From /home/peff/tmp/.
a4f00e2..22a4151 master -> origin/master
fatal: Not possible to fast-forward, aborting.
Which sounds like the same thing, modulo the error message not being
nearly as helpful (which I would be happy to see rectified).
Is there some other difference you're thinking of?
-Peff
