summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ci/_test-git-branch.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/ci/_test-git-branch.sh b/ci/_test-git-branch.sh
index da423f7..d4efd3e 100644
--- a/ci/_test-git-branch.sh
+++ b/ci/_test-git-branch.sh
@@ -52,7 +52,10 @@ while true; do
sync_git_repos
git_fetch linux $COMMIT
- git checkout $COMMIT
+ git checkout FETCH_HEAD
+
+ git_fetch linux ci-monkeypatch
+ git merge --no-edit FETCH_HEAD
mkdir -p ktest-out
rm -rf ktest-out/out