1621c99c79
Test that the revert command updates the work tree as expected (for submodule changes which don't result in conflicts). Add a helper function to first revert the checked out target commit to make the last revert produce the to-be-tested work tree. Set the KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT and KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR switches to document that revert has the similar failures. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
33 lines
1.0 KiB
Bash
Executable File
33 lines
1.0 KiB
Bash
Executable File
#!/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 czf "$TRASH_DIRECTORY/tmp.tgz" * &&
|
|
git checkout "$1" &&
|
|
git revert HEAD &&
|
|
rm -rf * &&
|
|
tar xzf "$TRASH_DIRECTORY/tmp.tgz" &&
|
|
git status -su >actual &&
|
|
ls -1pR * >>actual &&
|
|
test_cmp expect actual &&
|
|
git revert HEAD
|
|
}
|
|
|
|
KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
|
|
KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
|
|
test_submodule_switch "git_revert"
|
|
|
|
test_done
|