From: Lana Deere <lana.deere@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: 2.37.2 can't "git pull" but 2.18.0 can
Date: Tue, 6 Sep 2022 14:38:17 -0400 [thread overview]
Message-ID: <CA+4x=b91W31eAnShPzVw1zta43OYwArsgW0EsU1-0vkOw+qGyA@mail.gmail.com> (raw)
In-Reply-To: <9676rprp-s6p4-o2r5-6s86-5939os5qn855@tzk.qr>
With --prune set, the 2.18.0 pull still works but the 2.37.2 pull
still fails. There are several of us sharing this branch and we
aren't having any issues pushing or pulling with 2.18.0.
.. Lana (lana.deere@gmail.com)
On Mon, Sep 5, 2022 at 6:25 AM Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
>
> Hi Lana,
>
> On Fri, 2 Sep 2022, Lana Deere wrote:
>
> > I'm testing an upgrade to git 2.37.2 from the current version we're
> > using of 2.18.0. When I try to pull in my development tree, 2.37.2
> > gives me an error but 2.18.0 things all is fine:
> >
> > $ /tools/linux-x86_64/git/2.37.2/bin/git pull
> > Your configuration specifies to merge with the ref
> > 'refs/heads/feature/switch-to-qt5'
> > from the remote, but no such ref was fetched.
>
> I bet this means that that `switch-to-qt5` branch was deleted on the
> remote side, in which case...
>
> > $ /tools/linux-x86_64/git/2.18.0/bin/git pull
> > From http://githost:7990/scm/dp/sw
> > * branch feature/switch-to-qt5 -> FETCH_HEAD
> > Already up to date.
>
> ... Git would lie here and simply use the locally-cached version of the
> last successfully-fetched `switch-to-qt5` branch.
>
> To test this, you could pass the `--prune` option to `pull` (see
> https://git-scm.com/docs/git-pull#Documentation/git-pull.txt---prune for
> details), then try both pulls, and I bet _both_ will now fail.
>
> Ciao,
> Johannes
>
> > Anyone have any ideas about this? All I could find on google was a
> > suggestion that the "no such ref" message indicates the remote branch
> > was deleted, but that's not the case here.
> >
> >
> > .. Lana (lana.deere@gmail.com)
> >
next prev parent reply other threads:[~2022-09-06 18:39 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-02 19:27 2.37.2 can't "git pull" but 2.18.0 can Lana Deere
2022-09-02 20:16 ` brian m. carlson
2022-09-06 18:26 ` Lana Deere
2022-09-07 12:59 ` Johannes Schindelin
2022-09-07 15:59 ` Lana Deere
2022-09-08 18:20 ` Jeff King
2022-09-03 1:07 ` Jeff King
2022-09-06 19:37 ` Lana Deere
2022-09-07 2:11 ` Đoàn Trần Công Danh
2022-09-07 15:56 ` Lana Deere
2022-09-07 18:21 ` Jeff King
2022-09-07 18:53 ` Lana Deere
2022-09-07 21:10 ` Jeff King
2022-09-08 16:46 ` Lana Deere
2022-09-08 18:14 ` Jeff King
2022-09-08 19:23 ` [PATCH 0/2] v2 protocol can't "git pull" with restricted refspec Jeff King
2022-09-08 19:24 ` [PATCH 1/2] fetch: stop checking for NULL transport->remote in do_fetch() Jeff King
2022-09-08 19:26 ` [PATCH 2/2] fetch: add branch.*.merge to default ref-prefix extension Jeff King
2022-09-08 20:36 ` Junio C Hamano
2022-09-08 20:48 ` Junio C Hamano
2022-09-09 2:17 ` Jeff King
2022-09-09 5:23 ` Junio C Hamano
2022-09-11 5:08 ` Jeff King
2022-09-09 17:32 ` 2.37.2 can't "git pull" but 2.18.0 can Lana Deere
2022-09-09 18:27 ` Junio C Hamano
2022-09-12 14:58 ` Lana Deere
2022-09-13 0:28 ` Jeff King
2022-09-05 10:25 ` Johannes Schindelin
2022-09-06 18:38 ` Lana Deere [this message]
2022-09-07 10:20 ` Johannes Schindelin
2022-09-07 16:01 ` Lana Deere
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='CA+4x=b91W31eAnShPzVw1zta43OYwArsgW0EsU1-0vkOw+qGyA@mail.gmail.com' \
--to=lana.deere@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).