patch to git reset --hard instead of checkout

[packages/gitlab-runner.git] / branch-preserver.patch

--- 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 @@
 
 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)
 }
 
 func (b *AbstractShell) cacheFile(build *common.Build, userKey string) (key, file string) {