3 test_description
='revert can handle submodules'
6 .
"$TEST_DIRECTORY"/lib-submodule-update.sh
8 # Create a revert that moves from HEAD (including any test modifications to
9 # the work tree) to $1 by first checking out $1 and reverting it. Reverting
10 # the revert is the transition we test for. We tar the current work tree
11 # first so we can restore the work tree test setup after doing the checkout
12 # and revert. We test here that the restored work tree content is identical
13 # to that at the beginning. The last revert is then tested by the framework.
15 git status
-su >expect
&&
17 "$TAR" cf
"$TRASH_DIRECTORY/tmp.tar" * &&
18 may_only_be_test_must_fail
"$2" &&
19 $2 git checkout
"$1" &&
26 "$TAR" xf
"$TRASH_DIRECTORY/tmp.tar" &&
27 git status
-su >actual
&&
29 test_cmp expect actual
&&
33 if test "$GIT_TEST_MERGE_ALGORITHM" != ort
35 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR
=1
37 test_submodule_switch_func
"git_revert"