@matheusbsbs / matheus-bagliano / commits / 0fcd473fdd

t7001: add failure test which triggers assertion

`git mv a/a.txt a b/` is a nonsense instruction. Instead of failing gracefully the command trips over itself,[1] leaving behind unfinished work: 1. first it moves `a/a.txt` to `b/a.txt`; then 2. tries to move `a/`, including `a/a.txt`; then 3. figures out that it’s in a bad state (assertion); and finally 4. aborts. Now you’re left with a partially-updated index. The command should instead fail gracefully and make no changes to the index until it knows that it can complete a sensible action. For now just add a failing test since this has been known about for a while.[2] † 1: Caused by a `pos >= 0` assertion [2]: https://lore.kernel.org/git/d1f739fe-b28e-451f-9e01-3d2e24a0fe0d@app.fastmail.com/ Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Signed-off-by: Taylor Blau <me@ttaylorr.com>

Kristoffer Haugsbakk committed Oct 22, 2024 at 23:14 UTC 0fcd473fdd3f8d2c418a4fafcbee2a523bd610cb

1 file changed +12

t/t7001-mv.sh

+12

@@ -551,4 +551,16 @@ test_expect_success 'moving nested submodules' '

551 git status

552 '

553

554 +test_expect_failure 'nonsense mv triggers assertion failure and partially updated index' '

555 + test_when_finished git reset --hard HEAD &&

556 + git reset --hard HEAD &&

557 + mkdir -p a &&

558 + mkdir -p b &&

559 + >a/a.txt &&

560 + git add a/a.txt &&

561 + test_must_fail git mv a/a.txt a b &&

562 + git status --porcelain >actual &&

563 + grep "^A[ ]*a/a.txt$" actual

564 +'

565 +

566 test_done