Re: Regression in 'git branch -m'?

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 7, 2017, 01:31 UTC
Message-ID: <xmqq60brvj42.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20171006143745.w6q2yfgy6nvd2m2a@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> Earlier I blamed Duy's 31824d180d. And that is the start of the
> regression in v2.15, but only because it fixed another bug which was
> papering over the one I'm fixing here. :)

I haven't read Michael's reply, but 2/2 is very well explained and looks correct.

Thanks for digging this through to the root.

Show 10 quoted lines

>   [v1 1/2]: t3308: create a real ref directory/file conflict
>   [v1 2/2]: refs_resolve_ref_unsafe: handle d/f conflicts for writes
>
>  refs.c                  | 15 ++++++++++++++-
>  t/t1401-symbolic-ref.sh | 26 +++++++++++++++++++++++++-
>  t/t3200-branch.sh       | 10 ++++++++++
>  t/t3308-notes-merge.sh  |  2 +-
>  4 files changed, 50 insertions(+), 3 deletions(-)
>
> -Peff