Add custom ref setting to pull git repository

config-example.json

@@ -58,6 +58,10 @@
             "url" : "https://www.github.com/YourOrganization/RepoOne.git",
             "enable-push-updates" : true
         },
+        "RepoWithCustomRefs" : {
+            "url" : "https://www.github.com/YourOrganization/RepoOne.git",
+            "ref" : "develop"
+        },
         "RepoIsGitHubWiki" : {
           "url" : "https://github.com/YourOrganization/RepoWithWiki.wiki.git",
           "url-pattern" : {

config/config.go

@@ -29,6 +29,7 @@ type Repo struct {
 	Vcs               string         `json:"vcs"`
 	VcsConfigMessage  *SecretMessage `json:"vcs-config"`
 	UrlPattern        *UrlPattern    `json:"url-pattern"`
+	Ref               string         `json:"ref"`
 	ExcludeDotFiles   bool           `json:"exclude-dot-files"`
 	EnablePollUpdates *bool          `json:"enable-poll-updates"`
 	EnablePushUpdates *bool          `json:"enable-push-updates"`

searcher/searcher.go

@@ -348,7 +348,7 @@ func updateAndReindex(
 	defer lim.Release()
 
 	repo := s.Repo
-	newRev, err := wd.PullOrClone(vcsDir, repo.Url)
+	newRev, err := wd.PullOrClone(vcsDir, repo.Url, repo.Ref)
 
 	if err != nil {
 		log.Printf("vcs pull error (%s - %s): %s", name, repo.Url, err)
@@ -405,7 +405,7 @@ func newSearcher(
 		SpecialFiles:    wd.SpecialFiles(),
 	}
 
-	rev, err := wd.PullOrClone(vcsDir, repo.Url)
+	rev, err := wd.PullOrClone(vcsDir, repo.Url, repo.Ref)
 	if err != nil {
 		return nil, err
 	}

vcs/bzr.go

@@ -43,7 +43,7 @@ func (g *BzrDriver) HeadRev(dir string) (string, error) {
 	return strings.TrimSpace(buf.String()), cmd.Wait()
 }
 
-func (g *BzrDriver) Pull(dir string) (string, error) {
+func (g *BzrDriver) Pull(dir string, _ string) (string, error) {
 	cmd := exec.Command("bzr", "pull")
 	cmd.Dir = dir
 	out, err := cmd.CombinedOutput()

vcs/git.go

@@ -61,15 +61,19 @@ func run(desc, dir, cmd string, args ...string) error {
 	return nil
 }
 
-func (g *GitDriver) Pull(dir string) (string, error) {
+func (g *GitDriver) Pull(dir string, configRef string) (string, error) {
+	ref := configRef
+	if ref == "" {
+		ref = defaultRef
+	}
 	if err := run("git fetch", dir,
 		"git",
 		"fetch",
 		"--prune",
 		"--no-tags",
 		"--depth", "1",
 		"origin",
-		fmt.Sprintf("+%s:remotes/origin/%s", defaultRef, defaultRef)); err != nil {
+		fmt.Sprintf("+%s:remotes/origin/%s", ref, ref)); err != nil {
 		return "", err
 	}
 

vcs/hg.go

@@ -47,7 +47,7 @@ func (g *MercurialDriver) HeadRev(dir string) (string, error) {
 	return strings.TrimSpace(buf.String()), cmd.Wait()
 }
 
-func (g *MercurialDriver) Pull(dir string) (string, error) {
+func (g *MercurialDriver) Pull(dir string, _ string) (string, error) {
 	cmd := exec.Command("hg", "pull", "-u")
 	cmd.Dir = dir
 	err := cmd.Run()

vcs/svn.go

@@ -54,7 +54,7 @@ func (g *SVNDriver) HeadRev(dir string) (string, error) {
 	return strings.TrimSpace(buf.String()), cmd.Wait()
 }
 
-func (g *SVNDriver) Pull(dir string) (string, error) {
+func (g *SVNDriver) Pull(dir string, _ string) (string, error) {
 	cmd := exec.Command(
 		"svn",
 		"update",

vcs/vcs.go

@@ -19,7 +19,7 @@ type Driver interface {
 	Clone(dir, url string) (string, error)
 
 	// Pull new changes from the server and update the working directory.
-	Pull(dir string) (string, error)
+	Pull(dir string, ref string) (string, error)
 
 	// Return the revision at the head of the vcs directory.
 	HeadRev(dir string) (string, error)
@@ -69,9 +69,9 @@ func exists(path string) bool {
 
 // A utility method that carries out the common operation of cloning
 // if the working directory is absent and pulling otherwise.
-func (w *WorkDir) PullOrClone(dir, url string) (string, error) {
+func (w *WorkDir) PullOrClone(dir, url, ref string) (string, error) {
 	if exists(dir) {
-		return w.Pull(dir)
+		return w.Pull(dir, ref)
 	}
 	return w.Clone(dir, url)
 }