Merge branch 'main' into multiple_branches

cooperspencer · Aug 16, 2023 · e37b4c6 · e37b4c6
2 parents e368645 + f468f48
commit e37b4c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/local/local.go b/local/local.go
@@ -443,7 +443,6 @@ func TempClone(repo types.Repo, tempdir string) (*git.Repository, error) {
 	if err != nil {
 		return r, err
 	}
-
 	return r, nil
 }
 
@@ -504,6 +503,7 @@ func CreateRemotePush(repo *git.Repository, destination types.GenRepo, url strin
 	}
 	return err
 }
+
 func RandomString(length int) string {
 	charset := "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 	seededRand := rand.New(rand.NewSource(time.Now().UnixNano()))

diff --git a/main.go b/main.go
@@ -237,6 +237,7 @@ func backup(repos []types.Repo, conf *types.Conf) {
 							Msg(err.Error())
 						continue
 					}
+
 					defer os.RemoveAll(tempdir)
 					temprepo, err := local.TempClone(r, tempdir)
 					if err != nil {
@@ -314,6 +315,7 @@ func backup(repos []types.Repo, conf *types.Conf) {
 							Msg(err.Error())
 						continue
 					}
+
 					temprepo, err := local.TempClone(r, tempdir)
 					if err != nil {
 						if err == git.NoErrAlreadyUpToDate {
@@ -391,6 +393,7 @@ func backup(repos []types.Repo, conf *types.Conf) {
 							Msg(err.Error())
 						continue
 					}
+
 					temprepo, err := local.TempClone(r, tempdir)
 					if err != nil {
 						if err == git.NoErrAlreadyUpToDate {