On Fri, 15 Nov 2019 at 22:54, Mateusz Loskot <mateusz@xxxxxxxxxx> wrote: > On Wed, 13 Nov 2019 at 08:12, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Jeff King <peff@xxxxxxxx> writes: > > > > > If I do: > > > > > > git reset --hard tip && git merge --no-edit refs/heads/side > > > git log -1 --oneline > > > > > > then I get: > > > > > > Merge branch 'refs/heads/side' > > > > > > And the behavior seems the same going back to older versions of Git. Are > > > you sure your workflow hasn't changed somehow? > > > > > > Can you show an example that triggers the behavior for you? > > > > Yes, I am curious, too. > > Jeff, Junio, > > Thank you very much for your responses and confirmations > of expected behaviours. > > I will try to confirm with my colleagues what's changed, > what are actual commands and Git versions in use. > I'll be back here if I discover anything suspicious. Apparently, the workflow involved Git client Fork and one of recent updates of the client introduced the change in the behaviour: I reported the issue https://github.com/ForkIssues/TrackerWin/issues/570 and the bug has been confirmed "we replaced git merge branch with git merge /refs/heads/branch" Jeff, Junio, thanks for help. Best regards, -- Mateusz Loskot, http://mateusz.loskot.net
