]> git.pld-linux.org Git - packages/gitlab-runner.git/blob - branch-preserver.patch
fix nodim_gz patch, builds now
[packages/gitlab-runner.git] / branch-preserver.patch
1 --- gitlab-ci-multi-runner/shells/abstract.go~  2017-05-02 13:12:18.000000000 +0300
2 +++ gitlab-ci-multi-runner/shells/abstract.go   2017-05-16 08:10:46.528840805 +0300
3 @@ -96,7 +96,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  
15  func (b *AbstractShell) writeSubmoduleUpdateCmd(w ShellWriter, build *common.Build, recursive bool) {
This page took 0.1352 seconds and 3 git commands to generate.