It seems that t7406 is sometimes shaky - when checking stderr in test case 4.

The order of the submodules may vary, sorting the stderr output makes it

more reliable (and somewhat funny to read).

Does anybody have a better idea ?


[]

cat <<EOF >expect2
Cloning into '/Users/tb/NoBackup/projects/git/git.pu/t/trash directory.t7406-submodule-update/recursivesuper/super/merging'... Cloning into '/Users/tb/NoBackup/projects/git/git.pu/t/trash directory.t7406-submodule-update/recursivesuper/super/none'... Cloning into '/Users/tb/NoBackup/projects/git/git.pu/t/trash directory.t7406-submodule-update/recursivesuper/super/rebasing'... Cloning into '/Users/tb/NoBackup/projects/git/git.pu/t/trash directory.t7406-submodule-update/recursivesuper/super/submodule'... Submodule 'merging' (/Users/tb/NoBackup/projects/git/git.pu/t/trash directory.t7406-submodule-update/merging) registered for path '../super/merging' Submodule 'none' (/Users/tb/NoBackup/projects/git/git.pu/t/trash directory.t7406-submodule-update/none) registered for path '../super/none' Submodule 'rebasing' (/Users/tb/NoBackup/projects/git/git.pu/t/trash directory.t7406-submodule-update/rebasing) registered for path '../super/rebasing' Submodule 'submodule' (/Users/tb/NoBackup/projects/git/git.pu/t/trash directory.t7406-submodule-update/submodule) registered for path '../super/submodule'
done.
done.
done.
done.
EOF

test_expect_success 'submodule update --init --recursive from subdirectory' '
    git -C recursivesuper/super reset --hard HEAD^ &&
    (cd recursivesuper &&
     mkdir tmp &&
     cd tmp &&
     git submodule update --init --recursive ../super >../../actual 2>../../actual2U &&
     sort <../../actual2U >../../actual2
    ) &&
    test_i18ncmp expect actual &&
    test_i18ncmp expect2 actual2
'


Reply via email to