diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-05-08 12:36:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-08 12:36:32 -0700 |
| commit | 0730906043110523d844f7371770aee0bcacc1a9 (patch) | |
| tree | 6bdf0b37eb2d321f83317b1a9d38b0466cb95d84 /diff.c | |
| parent | 4a4656d0832ba14b2a41e5feba70fb388216f4f8 (diff) | |
| parent | 974f0d46645604ac45b8a5ce0b90e2b2a56ca764 (diff) | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions