mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-27 12:21:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1237 from pheuter/patch-1

Browse source 
When cloning pull requests, use specific branch
This commit is contained in:
Brad Rydzewski 2015-10-26 10:09:34 -07:00
commit f23037457b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shared/build/build_test.go
View file

@ -594,7 +594,7 @@ func TestWriteBuildScript(t *testing.T) {
f.WriteEnv("CI_PULL_REQUEST", "123") f.WriteEnv("CI_PULL_REQUEST", "123")
f.WriteHost("127.0.0.1") f.WriteHost("127.0.0.1")
f.WriteFile("$HOME/.ssh/id_rsa", []byte("ssh-rsa AAA..."), 600) f.WriteFile("$HOME/.ssh/id_rsa", []byte("ssh-rsa AAA..."), 600)
f.WriteCmd("git clone --depth=0 --recursive git://github.com/drone/drone.git /var/cache/drone/github.com/drone/drone") f.WriteCmd("git clone --depth=0 --recursive --branch=master git://github.com/drone/drone.git /var/cache/drone/github.com/drone/drone")
f.WriteCmd("git fetch origin +refs/pull/123/head:refs/remotes/origin/pr/123") f.WriteCmd("git fetch origin +refs/pull/123/head:refs/remotes/origin/pr/123")
f.WriteCmd("git checkout -qf -b pr/123 origin/pr/123") f.WriteCmd("git checkout -qf -b pr/123 origin/pr/123")

2
shared/build/repo/repo.go
View file

@ -120,7 +120,7 @@ func (r *Repo) Commands() []string {
cmds := []string{} cmds := []string{}
if len(r.PR) > 0 { if len(r.PR) > 0 {
// If a specific PR is provided then we need to clone it. // If a specific PR is provided then we need to clone it.
cmds = append(cmds, fmt.Sprintf("git clone --depth=%d --recursive %s %s", r.Depth, r.Path, r.Dir)) cmds = append(cmds, fmt.Sprintf("git clone --depth=%d --recursive --branch=%s %s %s", r.Depth, branch, r.Path, r.Dir))
cmds = append(cmds, fmt.Sprintf("git fetch origin +refs/pull/%s/head:refs/remotes/origin/pr/%s", r.PR, r.PR)) cmds = append(cmds, fmt.Sprintf("git fetch origin +refs/pull/%s/head:refs/remotes/origin/pr/%s", r.PR, r.PR))
cmds = append(cmds, fmt.Sprintf("git checkout -qf -b pr/%s origin/pr/%s", r.PR, r.PR)) cmds = append(cmds, fmt.Sprintf("git checkout -qf -b pr/%s origin/pr/%s", r.PR, r.PR))
} else { } else {