Skip CreateDotGitFolderWithRemote if .git exists (#57)

jfrog · Dec 21, 2022 · 7fc3c38 · 7fc3c38
1 parent 5c028ca
commit 7fc3c38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/vcsutils/utils.go b/vcsutils/utils.go
@@ -271,6 +271,10 @@ func generateErrorString(bodyArray []byte) string {
 // CreateDotGitFolderWithRemote creates a .git folder inside path with remote details of remoteName and remoteUrl
 func CreateDotGitFolderWithRemote(path, remoteName, remoteUrl string) error {
 	repo, err := git.PlainInit(path, false)
+	if err == git.ErrRepositoryAlreadyExists {
+		// If the .git folder already exists, we can skip this function
+		return nil
+	}
 	if err != nil {
 		return err
 	}

diff --git a/vcsutils/utils_test.go b/vcsutils/utils_test.go
@@ -181,8 +181,8 @@ func TestCreateDotGitFolderWithRemote(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, remote)
 	assert.Contains(t, remote.Config().URLs, "fakeurl")
-	// Return error if .git already exist
-	assert.Error(t, CreateDotGitFolderWithRemote(dir1, "origin", "fakeurl"))
+	// Return no err if .git already exist
+	assert.NoError(t, CreateDotGitFolderWithRemote(dir1, "origin", "fakeurl"))
 }
 
 func TestCreateDotGitFolderWithoutRemote(t *testing.T) {