suffix directory with branch if set

fixes #28
picostack · Mar 19, 2020 · b61ceac · b61ceac
1 parent 3023f29
commit b61ceac
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/service/watcher/reconfigure.go b/service/watcher/reconfigure.go
@@ -2,6 +2,7 @@ package watcher
 
 import (
 	"context"
+	"fmt"
 	"path/filepath"
 	"reflect"
 
@@ -101,11 +102,15 @@ func (w *Watcher) watchConfig() (err error) {
 func (w *Watcher) watchTargets() (err error) {
 	targetRepos := make([]gitwatch.Repository, len(w.targets))
 	for i, t := range w.targets {
-		zap.L().Debug("assigned target", zap.String("url", t.RepoURL))
+		dir := t.Name
+		if t.Branch != "" {
+			dir = fmt.Sprintf("%s_%s", t.Name, t.Branch)
+		}
+		zap.L().Debug("assigned target", zap.String("url", t.RepoURL), zap.String("directory", dir))
 		targetRepos[i] = gitwatch.Repository{
 			URL:       t.RepoURL,
 			Branch:    t.Branch,
-			Directory: t.Name,
+			Directory: dir,
 		}
 	}