Squashed 'third_party/git/' content from commit cb71568594
git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
This commit is contained in:
commit
1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
31
t/t3513-revert-submodule.sh
Executable file
31
t/t3513-revert-submodule.sh
Executable file
|
|
@ -0,0 +1,31 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='revert can handle submodules'
|
||||
|
||||
. ./test-lib.sh
|
||||
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
||||
|
||||
# Create a revert that moves from HEAD (including any test modifications to
|
||||
# the work tree) to $1 by first checking out $1 and reverting it. Reverting
|
||||
# the revert is the transition we test for. We tar the current work tree
|
||||
# first so we can restore the work tree test setup after doing the checkout
|
||||
# and revert. We test here that the restored work tree content is identical
|
||||
# to that at the beginning. The last revert is then tested by the framework.
|
||||
git_revert () {
|
||||
git status -su >expect &&
|
||||
ls -1pR * >>expect &&
|
||||
tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
|
||||
git checkout "$1" &&
|
||||
git revert HEAD &&
|
||||
rm -rf * &&
|
||||
tar xf "$TRASH_DIRECTORY/tmp.tar" &&
|
||||
git status -su >actual &&
|
||||
ls -1pR * >>actual &&
|
||||
test_cmp expect actual &&
|
||||
git revert HEAD
|
||||
}
|
||||
|
||||
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
|
||||
test_submodule_switch "git_revert"
|
||||
|
||||
test_done
|
||||
Loading…
Add table
Add a link
Reference in a new issue