From 43136eeb27a31d96cfeed83e84751dc02ea292b1 Mon Sep 17 00:00:00 2001 From: Jay Gabriels Date: Mon, 14 Feb 2022 09:06:06 -0800 Subject: [PATCH] Fix for perserve dir bug (#184) --- CHANGELOG.md | 1 + cmd/clone.go | 2 +- cmd/version.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce696fd..87d6bf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) ### Deprecated ### Removed ### Fixed +- GitLab `--preserve-dir` flag not being respected; thanks @attachmentgenie ### Security ## [1.7.7] - 2/12/22 diff --git a/cmd/clone.go b/cmd/clone.go index 8cc448e..20962d7 100644 --- a/cmd/clone.go +++ b/cmd/clone.go @@ -477,7 +477,7 @@ func CloneAllRepos(git git.Gitter, cloneTargets []scm.Repo) { repoSlug := getAppNameFromURL(repo.URL) limit.Execute(func() { if repo.Path != "" && os.Getenv("GHORG_PRESERVE_DIRECTORY_STRUCTURE") == "true" { - path = repo.Path + repoSlug = repo.Path } repo.HostPath = filepath.Join(os.Getenv("GHORG_ABSOLUTE_PATH_TO_CLONE_TO"), parentFolder, configs.GetCorrectFilePathSeparator(), repoSlug) diff --git a/cmd/version.go b/cmd/version.go index 70d8411..bbc073c 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -11,6 +11,6 @@ var versionCmd = &cobra.Command{ Short: "Print the version number of Ghorg", Long: `All software has versions. This is Ghorg's`, Run: func(cmd *cobra.Command, args []string) { - fmt.Println("v1.7.7") + fmt.Println("v1.7.8") }, }