Keep a count of clones so we can cleanup clone when not needed

api/internal/git/cloner.go

@@ -14,6 +14,7 @@ type Cloner func(repoSpec *RepoSpec) error
 
 var (
 	clones     = make(map[string]filesys.ConfirmedDir)
+	cloneCount = make(map[filesys.ConfirmedDir]int)
 	cloneMutex sync.Mutex
 )
 
@@ -23,6 +24,7 @@ var (
 func ClonerUsingGitExec(repoSpec *RepoSpec) error {
 	if dir, found := clones[repoSpec.Raw()]; found {
 		repoSpec.Dir = dir
+		cloneCount[dir] += 1
 		return nil
 	}
 
@@ -34,6 +36,7 @@ func ClonerUsingGitExec(repoSpec *RepoSpec) error {
 		return err
 	}
 	repoSpec.Dir = r.dir
+
 	if err = r.run("init"); err != nil {
 		return err
 	}
@@ -73,3 +76,16 @@ func DoNothingCloner(dir filesys.ConfirmedDir) Cloner {
 		return nil
 	}
 }
+
+// DecrementCloneCount decrements the count of repoSpecs using a directory clone.
+func DecrementCloneCount(dir filesys.ConfirmedDir) int {
+	cloneMutex.Lock()
+	defer cloneMutex.Unlock()
+
+	if count, exists := cloneCount[dir]; exists && count > 0 {
+		cloneCount[dir] -= 1
+		return cloneCount[dir]
+	}
+
+	return 0
+}

api/internal/git/repospec.go

@@ -72,7 +72,12 @@ func (x *RepoSpec) AbsPath() string {
 }
 
 func (x *RepoSpec) Cleaner(fSys filesys.FileSystem) func() error {
-	return func() error { return fSys.RemoveAll(x.Dir.String()) }
+	return func() error {
+		if DecrementCloneCount(x.Dir) == 0 {
+			return fSys.RemoveAll(x.Dir.String())
+		}
+		return nil
+	}
 }
 
 const (