All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Erwin Villejo <erwinvillejo@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git pull bug report
Date: Mon, 15 Nov 2021 12:40:21 -0800	[thread overview]
Message-ID: <xmqqfsrxdufe.fsf@gitster.g> (raw)
In-Reply-To: <CADL96rvRX2R_4Wm23tz88hDUztcpK531RU+Ops2UVoiOW0bCHw@mail.gmail.com> (Erwin Villejo's message of "Mon, 15 Nov 2021 15:42:15 +0700")

Erwin Villejo <erwinvillejo@gmail.com> writes:

> $ 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.

  parent reply	other threads:[~2021-11-15 21:23 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-15  8:42 git pull bug report Erwin Villejo
2021-11-15  8:54 ` Bagas Sanjaya
2021-11-15  8:56   ` Erwin Villejo
2021-11-15  9:12     ` Bagas Sanjaya
2021-11-15  9:19       ` Erwin Villejo
2021-11-15  9:39         ` Erwin Villejo
2021-11-15 18:15           ` Bryan Turner
2021-11-15 18:22             ` Erwin Villejo
2021-11-15 17:56 ` Bryan Turner
2021-11-15 20:40 ` Junio C Hamano [this message]
     [not found]   ` <CADL96rsnUCXchnrTa1rZ7WgJz2kDA-3TzeOiCy4AXNFdXtTmng@mail.gmail.com>
2021-11-16  1:43     ` Erwin Villejo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqfsrxdufe.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=erwinvillejo@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.