aboutsummaryrefslogtreecommitdiff
path: root/jenkins/bisect.jpl
diff options
context:
space:
mode:
authorGuillaume Tucker <guillaume.tucker@collabora.com>2019-03-11 11:15:34 +0000
committerGuillaume Tucker <guillaume.tucker@collabora.com>2019-03-15 17:46:54 +0000
commitf6c6a3aeefb904dd0702aee5f79918b2a68009f8 (patch)
treeab527d5f0e6e71b37901c8e0556c08f9188f9462 /jenkins/bisect.jpl
parentdd594f4f614d168f4c176a579a874bd6154a7386 (diff)
bisect.jpl: force-fetch git tags
Run "git fetch --tags -f" to force updating tags if there was already one with the same name as an incoming one. This caused some bisections on clk/clk-next to fail with this error: ! [rejected] clk-for-linus -> clk-for-linus (would clobber existing tag) This issue didn't occur with earlier versions of git (tested with 2.11.0) but can be reproduced with the version in the kernelci/build-base docker image (2.19.2). With the "-f" flag, the [rejected] message is replaced by a [tag update] like in earlier git versions and the new tag replaces the older one. Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com>
Diffstat (limited to 'jenkins/bisect.jpl')
-rw-r--r--jenkins/bisect.jpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/jenkins/bisect.jpl b/jenkins/bisect.jpl
index 4c4bbd9..715136d 100644
--- a/jenkins/bisect.jpl
+++ b/jenkins/bisect.jpl
@@ -204,7 +204,7 @@ git bisect reset || echo -n
git checkout --detach HEAD || echo -n
git branch -D ${params.KERNEL_BRANCH} || echo -n
for t in \$(git tag -l | grep ${env.JOB_NAME}); do git tag -d \$t; done
-git fetch ${params.KERNEL_TREE} ${params.KERNEL_BRANCH} --tags
+git fetch ${params.KERNEL_TREE} ${params.KERNEL_BRANCH} --tags -f
git checkout ${params.BAD_COMMIT} -b ${params.KERNEL_BRANCH}
git symbolic-ref HEAD refs/heads/${params.KERNEL_BRANCH}
""")