From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 May 2025 19:36:31 +0000 (-0700)
Subject: Merge branch 'ps/mv-contradiction-fix'
X-Git-Tag: v2.50.0-rc0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0730906043110523d844f7371770aee0bcacc1a9;p=thirdparty%2Fgit.git

Merge branch 'ps/mv-contradiction-fix'

"git mv a a/b dst" would ask to move the directory 'a' itself, as
well as its contents, in a single destination directory, which is
a contradicting request that is impossible to satisfy. This case is
now detected and the command errors out.

* ps/mv-contradiction-fix:
  builtin/mv: convert assert(3p) into `BUG()`
  builtin/mv: bail out when trying to move child and its parent
---

0730906043110523d844f7371770aee0bcacc1a9