Find correct subdirectory in project repo when outside GOPATH (elasti…

…c#17170)
ChrsMark · Mar 23, 2020 · 7f84270 · 7f84270
1 parent daf9099
commit 7f84270
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/dev-tools/mage/settings.go b/dev-tools/mage/settings.go
@@ -602,13 +602,13 @@ func getProjectRepoInfoWithModules() (*ProjectRepoInfo, error) {
 
 		if isRoot {
 			rootDir = possibleRoot
+			subDir, err = filepath.Rel(rootDir, cwd)
+			if err != nil {
+				errs = append(errs, err.Error())
+			}
 			break
 		}
 
-		subDir, err = filepath.Rel(possibleRoot, cwd)
-		if err != nil {
-			errs = append(errs, err.Error())
-		}
 		possibleRoot = filepath.Dir(possibleRoot)
 	}