Merge 57e4b2e into 929386f

bpineau · Jul 21, 2019 · 3db2c92 · 3db2c92
2 parents 929386f + 57e4b2e
commit 3db2c92
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/pkg/store/git/git.go b/pkg/store/git/git.go
@@ -163,6 +163,11 @@ func (s *Store) CloneOrInit() (err error) {
 		}
 	}
 
+	// One may both sync with a remote repos and keep a persistent local clone
+	if _, err := os.Stat(fmt.Sprintf("%s/.git/index", s.LocalDir)); err == nil {
+		return nil
+	}
+
 	if s.URL == "" {
 		err = s.Git("init", s.LocalDir)
 	} else {

diff --git a/pkg/store/git/git_test.go b/pkg/store/git/git_test.go
@@ -124,8 +124,8 @@ func TestGit(t *testing.T) {
 	// test various failure modes
 
 	_, err = repo.Start()
-	if err == nil {
-		t.Error("Start/Clone on an existing repository should fail")
+	if err != nil {
+		t.Error("Start/Clone on an existing repository should not fail")
 	}
 
 	err = repo.Git("fortzob", "42")