8f8ba56b5b
Test that the bisect command updates the work tree as expected. To make that work with the new submodule test framework a git_bisect helper function is added. This adds a commit after the one given to be switched to and makes that one the bad commit. The starting point is then given to bisect as the good commit which makes bisect change the work tree to the commit in between, which is the commit given. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
33 lines
695 B
Bash
Executable File
33 lines
695 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='bisect can handle submodules'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-submodule-update.sh
|
|
|
|
git_bisect () {
|
|
git status -su >expect &&
|
|
ls -1pR * >>expect &&
|
|
tar czf "$TRASH_DIRECTORY/tmp.tgz" * &&
|
|
GOOD=$(git rev-parse --verify HEAD) &&
|
|
git checkout "$1" &&
|
|
echo "foo" >bar &&
|
|
git add bar &&
|
|
git commit -m "bisect bad" &&
|
|
BAD=$(git rev-parse --verify HEAD) &&
|
|
git reset --hard HEAD^^ &&
|
|
git submodule update &&
|
|
git bisect start &&
|
|
git bisect good $GOOD &&
|
|
rm -rf * &&
|
|
tar xzf "$TRASH_DIRECTORY/tmp.tgz" &&
|
|
git status -su >actual &&
|
|
ls -1pR * >>actual &&
|
|
test_cmp expect actual &&
|
|
git bisect bad $BAD
|
|
}
|
|
|
|
test_submodule_switch "git_bisect"
|
|
|
|
test_done
|