Merge 2262db3 into 41cd799

bpineau · May 13, 2018 · 3527054 · 3527054
2 parents 41cd799 + 2262db3
commit 3527054
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/cmd/execute_test.go b/cmd/execute_test.go
@@ -25,6 +25,7 @@ func TestRootCmd(t *testing.T) {
 		"/dev/null",
 		"--dry-run",
 		"--dump-only",
+		"--no-git",
 		"--api-server",
 		"http://192.0.2.1", // RFC 5737 reserved/unroutable
 		"--log-level",

diff --git a/pkg/recorder/recorder.go b/pkg/recorder/recorder.go
@@ -157,7 +157,7 @@ func (w *Listener) save(file string, data []byte) error {
 		return fmt.Errorf("can't create local directory %s: %v", dir, err)
 	}
 
-	tmpf, err := afero.TempFile(appFs, "", "katafygio")
+	tmpf, err := afero.TempFile(appFs, dir, ".temp-katafygio-")
 	if err != nil {
 		return fmt.Errorf("failed to create a temporary file: %v", err)
 	}

diff --git a/pkg/store/git/git.go b/pkg/store/git/git.go
@@ -174,6 +174,11 @@ func (s *Store) CloneOrInit() (err error) {
 			s.Email, s.LocalDir, err)
 	}
 
+	err = afero.WriteFile(appFs, s.LocalDir+"/.git/info/exclude", []byte(".temp-katafygio-*"), 0644)
+	if err != nil {
+		return fmt.Errorf("failed to create a git exclusion: %v", err)
+	}
+
 	return nil
 }