Merge branch 'master' into fix-324/full-scan

Author: ajnavarro

cmd/gitbase/command/server.go

@@ -271,7 +271,7 @@ func (c *Server) addMatch(match string) error {
 
 		if !c.DisableSiva &&
 			info.Mode().IsRegular() && gitbase.IsSivaFile(info.Name()) {
-			if err := c.pool.AddSivaFile(path); err != nil {
+			if err := c.pool.AddSivaFileWithID(info.Name(), path); err != nil {
 				logrus.WithFields(logrus.Fields{
 					"path":  path,
 					"error": err,

repository_pool.go

@@ -171,24 +171,26 @@ func (p *RepositoryPool) Add(repo repository) error {
 	return nil
 }
 
-// AddGit checks if a git repository can be opened and adds it to the pool. It
-// also sets its path as ID.
+// AddGit adds a git repository to the pool. It also sets its path as ID.
 func (p *RepositoryPool) AddGit(path string) error {
 	return p.AddGitWithID(path, path)
 }
 
-// AddGitWithID checks if a git repository can be opened and adds it to the
-// pool. ID should be specified.
+// AddGitWithID adds a git repository to the pool. ID should be specified.
 func (p *RepositoryPool) AddGitWithID(id, path string) error {
 	return p.Add(gitRepo(id, path))
 }
 
-// AddSivaFile adds to the pool the given file if it's a siva repository,
-// that is, has the .siva extension
+// AddSivaFile adds a siva file to the pool. It also sets its path as ID.
 func (p *RepositoryPool) AddSivaFile(path string) error {
 	return p.Add(sivaRepo(path, path))
 }
 
+// AddSivaFileWithID adds a siva file to the pool. ID should be specified.
+func (p *RepositoryPool) AddSivaFileWithID(id, path string) error {
+	return p.Add(sivaRepo(id, path))
+}
+
 // GetPos retrieves a repository at a given position. If the position is
 // out of bounds it returns io.EOF.
 func (p *RepositoryPool) GetPos(pos int) (*Repository, error) {