mv test: recreate mod/ directory instead of relying on stale copy

The tests for 'git mv moves a submodule' functionality often run
commands like

git mv sub mod/sub

to move a submodule into a subdirectory.  Just like plain /bin/mv,
this is supposed to succeed if the mod/ parent directory exists
and fail if it doesn't exist.

Usually these tests mkdir the parent directory beforehand, but some
instead rely on it being left behind by previous tests.

More precisely, when 'git reset --hard' tries to move to a state where
mod/sub is not present any more, it would perform the following
operations:

rmdir("mod/sub")
rmdir("mod")

The first fails with ENOENT because the test script removed mod/sub
with "rm -rf" already, so 'reset --hard' doesn't bother to move on to
the second, and the mod/ directory is kept around.

Better to explicitly remove and re-create the mod/ directory so later
tests don't have to depend on the directory left behind by the earlier
ones at all (making it easier to rearrange or skip some tests in the
file or to tweak 'reset --hard' behavior without breaking unrelated
tests).

Noticed while testing a patch that fixes the reset --hard behavior
described above.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Reviewed-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 54d78079e83d7d02f69035d3bf3999084f61834a..69f11bd40d56cb945023ee0d299acd6d6f4a5fed 100755 (executable)
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -350,10 +350,11 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
 '
 
 test_expect_success 'git mv moves a submodule with gitfile' '
 '
 
 test_expect_success 'git mv moves a submodule with gitfile' '

-       rm -rf mod/sub &&
+       rm -rf mod &&

        git reset --hard &&
        git submodule update &&
        entry="$(git ls-files --stage sub | cut -f 1)" &&
        git reset --hard &&
        git submodule update &&
        entry="$(git ls-files --stage sub | cut -f 1)" &&

+       mkdir mod &&

        (
                cd mod &&
                git mv ../sub/ .
        (
                cd mod &&
                git mv ../sub/ .


@@ -372,11 +373,12 @@ test_expect_success 'git mv moves a submodule with gitfile' '
 '
 
 test_expect_success 'mv does not complain when no .gitmodules file is found' '
 '
 
 test_expect_success 'mv does not complain when no .gitmodules file is found' '

-       rm -rf mod/sub &&
+       rm -rf mod &&

        git reset --hard &&
        git submodule update &&
        git rm .gitmodules &&
        entry="$(git ls-files --stage sub | cut -f 1)" &&
        git reset --hard &&
        git submodule update &&
        git rm .gitmodules &&
        entry="$(git ls-files --stage sub | cut -f 1)" &&

+       mkdir mod &&

        git mv sub mod/sub 2>actual.err &&
        ! test -s actual.err &&
        ! test -e sub &&
        git mv sub mod/sub 2>actual.err &&
        ! test -s actual.err &&
        ! test -e sub &&


@@ -390,11 +392,12 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
 '
 
 test_expect_success 'mv will error out on a modified .gitmodules file unless staged' '
 '
 
 test_expect_success 'mv will error out on a modified .gitmodules file unless staged' '

-       rm -rf mod/sub &&
+       rm -rf mod &&

        git reset --hard &&
        git submodule update &&
        git config -f .gitmodules foo.bar true &&
        entry="$(git ls-files --stage sub | cut -f 1)" &&
        git reset --hard &&
        git submodule update &&
        git config -f .gitmodules foo.bar true &&
        entry="$(git ls-files --stage sub | cut -f 1)" &&

+       mkdir mod &&

        test_must_fail git mv sub mod/sub 2>actual.err &&
        test -s actual.err &&
        test -e sub &&
        test_must_fail git mv sub mod/sub 2>actual.err &&
        test -s actual.err &&
        test -e sub &&


@@ -413,13 +416,14 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
 '
 
 test_expect_success 'mv issues a warning when section is not found in .gitmodules' '
 '
 
 test_expect_success 'mv issues a warning when section is not found in .gitmodules' '

-       rm -rf mod/sub &&
+       rm -rf mod &&

        git reset --hard &&
        git submodule update &&
        git config -f .gitmodules --remove-section submodule.sub &&
        git add .gitmodules &&
        entry="$(git ls-files --stage sub | cut -f 1)" &&
        echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
        git reset --hard &&
        git submodule update &&
        git config -f .gitmodules --remove-section submodule.sub &&
        git add .gitmodules &&
        entry="$(git ls-files --stage sub | cut -f 1)" &&
        echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&

+       mkdir mod &&

        git mv sub mod/sub 2>actual.err &&
        test_i18ncmp expect.err actual.err &&
        ! test -e sub &&
        git mv sub mod/sub 2>actual.err &&
        test_i18ncmp expect.err actual.err &&
        ! test -e sub &&


@@ -433,9 +437,10 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
 '
 
 test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '
 '
 
 test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '

-       rm -rf mod/sub &&
+       rm -rf mod &&

        git reset --hard &&
        git submodule update &&
        git reset --hard &&
        git submodule update &&

+       mkdir mod &&

        git mv -n sub mod/sub 2>actual.err &&
        test -f sub/.git &&
        git diff-index --exit-code HEAD &&
        git mv -n sub mod/sub 2>actual.err &&
        test -f sub/.git &&
        git diff-index --exit-code HEAD &&