Hi Lana, Please find my reply inline. On Tue, 6 Sep 2022, Lana Deere wrote: > 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. Oh, so there _is_ a remote branch called `feature/switch-to-qt5`? What happens if you call `git pull origin feature/switch-to-qt5` explicitly? Ciao, Johannes > > .. Lana (lana.deere@xxxxxxxxx) > > > > On Mon, Sep 5, 2022 at 6:25 AM Johannes Schindelin > <Johannes.Schindelin@xxxxxx> 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@xxxxxxxxx) > > > >
