git: minor cleanup

Michael Muré created 6 years ago

Change summary

repository/git_testing.go | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

Detailed changes

repository/git_testing.go

@@ -1,10 +1,10 @@
 package repository
 
 import (
-	"strings"
 	"io/ioutil"
 	"log"
 	"os"
+	"strings"
 	"testing"
 )
 
@@ -45,15 +45,16 @@ func CleanupTestRepos(t testing.TB, repos ...Repo) {
 	var firstErr error
 	for _, repo := range repos {
 		path := repo.GetPath()
-		if (strings.HasSuffix(path,"/.git")) {
-			// non bare repository, remove complete repos not
-			// only git meta data.
-			path=strings.TrimSuffix(path,"/.git");
-			// Testing non bare repo should also check path is
+		if strings.HasSuffix(path, "/.git") {
+			// for a normal repository (not --bare), we want to remove everything
+			// including the parent directory where files are checked out
+			path = strings.TrimSuffix(path, "/.git")
+
+			// Testing non-bare repo should also check path is
 			// only .git (i.e. ./.git), but doing so, we should
 			// try to remove the current directory and hav some
 			// trouble. In the present case, this case should not
-			// occure.
+			// occur.
 			// TODO consider warning or error when path == ".git"
 		}
 		// fmt.Println("Cleaning repo:", path)