[packages/gitlab-ci-multi-runner] use single checkout command

[glen]

commit 1f4a44a3cac855936d3696a03f779bbd47be8eb4
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Oct 24 11:46:48 2016 +0300

    use single checkout command

 branch-preserver.patch | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/branch-preserver.patch b/branch-preserver.patch
index dc03087..61b400c 100644
--- a/branch-preserver.patch
+++ b/branch-preserver.patch
@@ -1,12 +1,11 @@
 --- gitlab-ci-multi-runner-1.6.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go~	2016-09-22 20:36:49.000000000 +0300
 +++ gitlab-ci-multi-runner-1.6.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go	2016-10-24 11:05:20.385999188 +0300
-@@ -99,7 +99,8 @@
+@@ -99,7 +99,7 @@
  
  func (b *AbstractShell) writeCheckoutCmd(w ShellWriter, build *common.Build) {
  	w.Notice("Checking out %s as %s...", build.Sha[0:8], build.RefName)
 -	w.Command("git", "checkout", "-q", build.Sha)
-+	w.Command("git", "checkout", "-q", build.RefName)
-+	w.Command("git", "reset", "--hard", "-q", build.Sha)
++	w.Command("git", "checkout", "-fq", "-B", build.RefName, build.Sha)
  }
  
  func (b *AbstractShell) cacheFile(build *common.Build, userKey string) (key, file string) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ci-multi-runner.git/commitdiff/1f4a44a3cac855936d3696a03f779bbd47be8eb4