Re: Regression in 'git branch -m'?
- Date: Sat, 07 Oct 2017 10:31:41 +0900
- From: Junio C Hamano <gitster@xxxxxxxxx>
- Subject: Re: Regression in 'git branch -m'?
Jeff King <peff@xxxxxxxx> 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
Thanks for digging this through to the root.
> [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(-)