Do not commit swap files

Eventually this list should be configurable.

Author: vHanda

common/commit.go

@@ -32,8 +32,17 @@ func commit(repoPath string) error {
 continue
 }
 
+ignore, err := ShouldIgnoreFile(repoPath, filePath)
+if err != nil {
+return tracerr.Wrap(err)
+}
+
+if ignore {
+continue
+}
+
 hasChanges = true
-_, err := w.Add(filePath)
+_, err = w.Add(filePath)
 if err != nil {
 return tracerr.Wrap(err)
 }

common/ignore.go

@@ -2,6 +2,7 @@ package common
 
 import (
 "os"
+"path"
 "path/filepath"
 "strings"
 
@@ -10,8 +11,12 @@ import (
 "gopkg.in/src-d/go-git.v4/plumbing/format/gitignore"
 )
 
-func ShouldIgnoreFile(repoPath string, fullFilePath string) (bool, error) {
-fileName := filepath.Base(fullFilePath)
+func ShouldIgnoreFile(repoPath string, filePath string) (bool, error) {
+if !filepath.IsAbs(filePath) {
+filePath = path.Join(repoPath, filePath)
+}
+
+fileName := filepath.Base(filePath)
 var isTempFile = strings.HasSuffix(fileName, ".swp") || // vim
 strings.HasPrefix(fileName, "~") || // emacs
 strings.HasSuffix(fileName, "~") || // kate
@@ -23,20 +28,20 @@ func ShouldIgnoreFile(repoPath string, fullFilePath string) (bool, error) {
 return true, nil
 }
 
-relativePath := fullFilePath[len(repoPath)+1:]
+relativePath := filePath[len(repoPath)+1:]
 if strings.HasPrefix(relativePath, ".git/") {
 return true, nil
 }
 
-empty, err := isEmptyFile(fullFilePath)
+empty, err := isEmptyFile(filePath)
 if err != nil {
 return false, tracerr.Wrap(err)
 }
 if empty {
 return true, nil
 }
 
-return isFileIgnoredByGit(repoPath, fullFilePath)
+return isFileIgnoredByGit(repoPath, filePath)
 }
 
 func isFileIgnoredByGit(repoPath string, filePath string) (bool, error) {