f4609b896f
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
37 lines
776 B
Bash
Executable file
37 lines
776 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 cf "$TRASH_DIRECTORY/tmp.tar" * &&
|
|
GOOD=$(git rev-parse --verify HEAD) &&
|
|
may_only_be_test_must_fail "$2" &&
|
|
$2 git checkout "$1" &&
|
|
if test -n "$2"
|
|
then
|
|
return
|
|
fi &&
|
|
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 xf "$TRASH_DIRECTORY/tmp.tar" &&
|
|
git status -su >actual &&
|
|
ls -1pR * >>actual &&
|
|
test_cmp expect actual &&
|
|
git bisect bad $BAD
|
|
}
|
|
|
|
test_submodule_switch_func "git_bisect"
|
|
|
|
test_done
|