aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Devaux <sebastien.devaux@laposte.net>2019-08-27 21:35:04 +0200
committerSebastien Devaux <sebastien.devaux@laposte.net>2019-08-27 21:35:04 +0200
commitddcbd8d022af0451ff87734fb443b27f98a490dd (patch)
treeaa0262fe758f931e8eec0be32c2dd9a9aaf84d75
parent7e123fbfcae76e3ad188cfa5e98c27adcde8d6d7 (diff)
downloadgit-bug-ddcbd8d022af0451ff87734fb443b27f98a490dd.tar.gz
issue 178: adding required changes to InitGitRepo and CleanupTestRepos
-rw-r--r--repository/git.go2
-rw-r--r--repository/git_testing.go12
2 files changed, 13 insertions, 1 deletions
diff --git a/repository/git.go b/repository/git.go
index c03cf979..d9a92c82 100644
--- a/repository/git.go
+++ b/repository/git.go
@@ -115,7 +115,7 @@ func NewGitRepo(path string, witnesser Witnesser) (*GitRepo, error) {
// InitGitRepo create a new empty git repo at the given path
func InitGitRepo(path string) (*GitRepo, error) {
- repo := &GitRepo{Path: path}
+ repo := &GitRepo{Path: path+"/.git"}
err := repo.createClocks()
if err != nil {
return nil, err
diff --git a/repository/git_testing.go b/repository/git_testing.go
index dd597a8e..b844fbbe 100644
--- a/repository/git_testing.go
+++ b/repository/git_testing.go
@@ -1,6 +1,7 @@
package repository
import (
+ "strings"
"io/ioutil"
"log"
"os"
@@ -44,6 +45,17 @@ 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
+ // 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.
+ // TODO consider warning or error when path == ".git"
+ }
// fmt.Println("Cleaning repo:", path)
err := os.RemoveAll(path)
if err != nil {