]> git.pld-linux.org Git - packages/gitlab-runner.git/blob - branch-preserver.patch
e47cbcf86ed390e368fc755ce08baa4f12faf0e9
[packages/gitlab-runner.git] / branch-preserver.patch
1 --- gitlab-runner/shells/abstract.go~   2019-10-28 14:11:26.000000000 +0200
2 +++ gitlab-runner/shells/abstract.go    2019-11-10 02:47:02.568781451 +0200
3 @@ -337,7 +337,11 @@
4  
5  func (b *AbstractShell) writeCheckoutCmd(w ShellWriter, build *common.Build) {
6         w.Notice("Checking out %s as %s...", build.GitInfo.Sha[0:8], build.GitInfo.Ref)
7 -       w.Command("git", "checkout", "-f", "-q", build.GitInfo.Sha)
8 +       if build.GitInfo.RefType == common.RefTypeTag {
9 +               w.Command("git", "checkout", "-f", "-q", build.GitInfo.Sha)
10 +       } else {
11 +               w.Command("git", "checkout", "-fq", "-B", build.GitInfo.Ref, build.GitInfo.Sha)
12 +       }
13  
14         cleanFlags := build.GetGitCleanFlags()
15         if len(cleanFlags) > 0 {
This page took 0.068989 seconds and 2 git commands to generate.