Jens Lehmann | 1621c99 | 2014-06-19 22:12:56 +0200 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | |
| 3 | test_description='revert can handle submodules' |
| 4 | |
| 5 | . ./test-lib.sh |
| 6 | . "$TEST_DIRECTORY"/lib-submodule-update.sh |
| 7 | |
| 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. |
| 14 | git_revert () { |
| 15 | git status -su >expect && |
| 16 | ls -1pR * >>expect && |
Đoàn Trần Công Danh | 5317dfe | 2021-05-22 14:10:08 +0700 | [diff] [blame] | 17 | "$TAR" cf "$TRASH_DIRECTORY/tmp.tar" * && |
Denton Liu | 5b0ac09 | 2020-06-24 04:50:18 -0400 | [diff] [blame] | 18 | may_only_be_test_must_fail "$2" && |
| 19 | $2 git checkout "$1" && |
| 20 | if test -n "$2" |
| 21 | then |
| 22 | return |
| 23 | fi && |
Jens Lehmann | 1621c99 | 2014-06-19 22:12:56 +0200 | [diff] [blame] | 24 | git revert HEAD && |
| 25 | rm -rf * && |
Đoàn Trần Công Danh | 5317dfe | 2021-05-22 14:10:08 +0700 | [diff] [blame] | 26 | "$TAR" xf "$TRASH_DIRECTORY/tmp.tar" && |
Jens Lehmann | 1621c99 | 2014-06-19 22:12:56 +0200 | [diff] [blame] | 27 | git status -su >actual && |
| 28 | ls -1pR * >>actual && |
| 29 | test_cmp expect actual && |
| 30 | git revert HEAD |
| 31 | } |
| 32 | |
Elijah Newren | aa2faac | 2021-03-20 00:03:51 +0000 | [diff] [blame] | 33 | if test "$GIT_TEST_MERGE_ALGORITHM" != ort |
| 34 | then |
| 35 | KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1 |
| 36 | fi |
Denton Liu | aa06180 | 2020-06-11 13:41:49 -0400 | [diff] [blame] | 37 | test_submodule_switch_func "git_revert" |
Jens Lehmann | 1621c99 | 2014-06-19 22:12:56 +0200 | [diff] [blame] | 38 | |
| 39 | test_done |