Merge pull request #27 from screwdriver-cd/fixbranch

Adding parsing of the branch from SCMUrl

git/git.go

@@ -4,18 +4,28 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"strings"
 )
 
 var execCommand = exec.Command
 
 // Clone clones a git repo into a destination directory
-func Clone(repo, destination string) error {
+func Clone(scmURL, destination string) error {
+	parts := strings.Split(scmURL, "#")
+	if len(parts) < 2 {
+		return fmt.Errorf("expected #branchname in SCM URL: %v", scmURL)
+	}
+
+	repo := parts[0]
 	cmd := execCommand("git", "clone", repo, destination)
 	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+
 	err := cmd.Start()
 	if err != nil {
 		return fmt.Errorf("starting git clone command: %v", err)
 	}
+
 	err = cmd.Wait()
 	if err != nil {
 		return fmt.Errorf("cloning git repo: %v", err)

git/git_test.go

@@ -23,8 +23,9 @@ func fakeExecCommand(command string, args ...string) *exec.Cmd {
 	return cmd
 }
 
-func TestCheckout(t *testing.T) {
-	wantRepo := "testrepo"
+func TestClone(t *testing.T) {
+	wantRepo := "git@github.com:screwdriver-cd/launcher"
+	scmURL := "git@github.com:screwdriver-cd/launcher#master"
 	wantDest := "testdest"
 	execCommand = getFakeExecCommand(func(cmd string, args ...string) {
 		want := []string{
@@ -40,7 +41,7 @@ func TestCheckout(t *testing.T) {
 		}
 	})
 
-	err := Clone(wantRepo, wantDest)
+	err := Clone(scmURL, wantDest)
 	if err != nil {
 		t.Errorf("Unexpected error from git clone: %v", err)
 	}