Initialise annex with filesize filter

Let git add --all do the adding and annex will take over for adding to
annex and git.

models/models_gin.go

@@ -65,7 +65,7 @@ func annexUninit(path string) {
 	}
 }
 
-func annexAdd(path string) {
+func annexSetup(path string) {
 	log.Trace("Running annex add (with filesize filter) in '%s'", path)
 
 	// Initialise annex in case it's a new repository
@@ -84,9 +84,9 @@ func annexAdd(path string) {
 		log.Error(1, "Failed to set default backend to 'MD5': %v (%s)", err, msg)
 	}
 
-	sizefilterflag := fmt.Sprintf("--largerthan=%d", setting.Repository.Upload.AnnexFileMinSize*gannex.MEGABYTE)
-	if msg, err := gannex.Add(path, sizefilterflag); err != nil {
-		log.Error(1, "Annex add failed with error: %v (%s)", err, msg)
+	// Set size filter in config
+	if msg, err := gannex.SetAnnexSizeFilter(path, setting.Repository.Upload.AnnexFileMinSize*gannex.MEGABYTE); err != nil {
+		log.Error(2, "Failed to set size filter for annex: %v (%s)", err, msg)
 	}
 }
 

models/repo_editor.go

@@ -499,7 +499,7 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions)
 		}
 	}
 
-	annexAdd(localPath) // Running annex add with filter for big files
+	annexSetup(localPath) // Initialise annex and set configuration (with add filter for filesizes)
 	if err = git.AddChanges(localPath, true); err != nil {
 		return fmt.Errorf("git add --all: %v", err)
 	} else if err = git.CommitChanges(localPath, git.CommitChangesOptions{

vendor/github.com/G-Node/go-annex/add.go

@@ -1,6 +1,8 @@
 package gannex
 
 import (
+	"fmt"
+
 	"github.com/G-Node/git-module"
 )
 
@@ -47,3 +49,8 @@ func SetAddUnlocked(dir string) (string, error) {
 	cmd := git.NewCommand("config", "annex.addunlocked", "true")
 	return cmd.RunInDir(dir)
 }
+
+func SetAnnexSizeFilter(dir string, size int64) (string, error) {
+	cmd := git.NewCommand("config", "annex.largefiles", fmt.Sprintf("largerthan=%d", size))
+	return cmd.RunInDir(dir)
+}