Re: git pull bug report

Please check PR: https://github.com/gitgitgadget/git/pull/1078

Thanks.


On Tue, Nov 16, 2021 at 7:23 AM Erwin Villejo [off-list ref] wrote:

361cb523 fixes only the --ff-only case.

It's still broken for unspecified/unset fast-forward flag and config (pull.ff and pull.rebase).

Br, Erwin


On Tue, Nov 16, 2021, 3:40 AM Junio C Hamano, [off-list ref] wrote:

quoted

Erwin Villejo [off-list ref] writes:

quoted

$ git pull
hint: You have divergent branches and need to specify how to reconcile them.
...
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.

> What's different between what you expected and what actually happened?
I expected no failure and no-op since local is ahead of upstream.
Instead, `git pull`
fails because it thinks the branches have diverged.

I think this was fixed at 361cb523 (pull: --ff-only should make it a
noop when already-up-to-date, 2021-10-20); it was broken between Git
2.33 and Git 2.33.1, IIRC.

Thanks.