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

--- gitlab-ci-multi-runner-1.7.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go~	2016-10-21 23:19:09.000000000 +0300
+++ gitlab-ci-multi-runner-1.7.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go	2016-10-24 11:51:14.842526005 +0300
@@ -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", "-f", "-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) {
Commit	Line	Data
b42fabfa ER	1	--- gitlab-ci-multi-runner-1.7.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go~ 2016-10-21 23:19:09.000000000 +0300
b42fabfa ER	2	+++ gitlab-ci-multi-runner-1.7.0/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner/shells/abstract.go 2016-10-24 11:51:14.842526005 +0300
1f4a44a3	3	@@ -99,7 +99,7 @@
c4affa20 ER	4
	5	func (b AbstractShell) writeCheckoutCmd(w ShellWriter, build common.Build) {
	6	w.Notice("Checking out %s as %s...", build.Sha[0:8], build.RefName)
b42fabfa	7	- w.Command("git", "checkout", "-f", "-q", build.Sha)
1f4a44a3	8	+ w.Command("git", "checkout", "-fq", "-B", build.RefName, build.Sha)
c4affa20 ER	9	}
	10
	11	func (b AbstractShell) cacheFile(build common.Build, userKey string) (key, file string) {