Re: 2.37.2 can't "git pull" but 2.18.0 can

From: Lana Deere <lana.deere@gmail.com>
Date: Sep 6, 2022, 18:26 UTC
Message-ID: <CA+4x=b_KP4rMH-EDmVCD_4LHPiLx32J2OJC6Mm5xpQ-QUcSKuA@mail.gmail.com>
In-Reply-To: <YxJkn7K3zRm1u3Vn@tapette.crustytoothpaste.net>

The 'git ls-remote origin' command on both produces about 3600 lines of output which appears to consist of all the branches in our repo. The two outputs are identical according to diff. Both include a single mention of the switch-to-qt5 branch,

$ diff /tmp/ls-remote* [no output here] $ grep switch-to-qt5 /tmp/ls-remote.* /tmp/ls-remote.2.18:6a9363081d05c313ba6a6ac59183193f1340bb1f refs/heads/feature/switch-to-qt5 /tmp/ls-remote.2.37:6a9363081d05c313ba6a6ac59183193f1340bb1f refs/heads/feature/switch-to-qt5

The 'git config -l' from both versions is almost the same - two lines have moved around. $ diff /tmp/config* 1,2d0 < filter.lfs.required=true < filter.lfs.clean=git-lfs clean -- %f 4a3,4

> filter.lfs.required=true
> filter.lfs.clean=git-lfs clean -- %f

$ cat /tmp/config.2.37 filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true filter.lfs.clean=git-lfs clean -- %f user.name=Lana Deere user.email=lana.deere@gmail.com filter.lfs.clean=git-lfs clean -- %f filter.lfs.smudge=git-lfs smudge -- %f filter.lfs.process=git-lfs filter-process filter.lfs.required=true color.branch=false color.diff=false color.grep=false color.interactive=false color.pager=false color.showbranch=false color.status=false color.ui=false core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true remote.origin.url=http://lana@githost:7990/scm/dp/sw.git remote.origin.fetch=+refs/heads/master:refs/remotes/origin/master branch.master.remote=origin branch.master.merge=refs/heads/master branch.feature/switch-to-qt5.remote=origin branch.feature/switch-to-qt5.merge=refs/heads/feature/switch-to-qt5

.. Lana (lana.deere@gmail.com)

On Fri, Sep 2, 2022 at 4:16 PM brian m. carlson <sandals@crustytoothpaste.net> wrote:

Show 28 quoted lines

>
> On 2022-09-02 at 19:27:55, 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.
> >
> > $ /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.
> >
> > 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.
>
> Can you provide the output of `git ls-remote origin` (assuming that's
> the remote you're using) and `git config -l` (the latter with both
> versions)?  I don't know of any reason why Git 2.37 should be broken in
> this regard, but I suspect that there's a difference in configuration
> between the two leading to this.
> --
> brian m. carlson (he/him or they/them)
> Toronto, Ontario, CA