From 85f2e5cb9a2ff407cf5d112e754e0328f9a83442 Mon Sep 17 00:00:00 2001 From: Efi Merdler-Kravitz <43570637+efimk-lu@users.noreply.github.com> Date: Thu, 23 Sep 2021 21:20:25 +0300 Subject: [PATCH 1/2] Use a more generic way to pull repo name Because folder name can change, getting the repo name from the folder name is dangerous. See https://stackoverflow.com/a/42543006 --- src/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index a5f1a50..aa7de60 100644 --- a/src/index.js +++ b/src/index.js @@ -85,8 +85,8 @@ export default class ServerlessGitVariables { break } case 'repository': { - const pathName = await _exec('git rev-parse --show-toplevel') - value = path.basename(pathName) + const pathName = await _exec('git config --get remote.origin.url') + value = path.basename(pathName, ".git") break } case 'tags': From 066cea4f54e690c96a2bed7a99b96a3cd78ca62a Mon Sep 17 00:00:00 2001 From: Efi Merdler-Kravitz <43570637+efimk-lu@users.noreply.github.com> Date: Thu, 7 Oct 2021 19:25:02 +0000 Subject: [PATCH 2/2] Update src/index.js Co-authored-by: Jay Vercellone --- src/index.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index aa7de60..68ecd23 100644 --- a/src/index.js +++ b/src/index.js @@ -85,8 +85,11 @@ export default class ServerlessGitVariables { break } case 'repository': { - const pathName = await _exec('git config --get remote.origin.url') - value = path.basename(pathName, ".git") + const firstRemoteName = await _exec('git remote | head -1') + const remoteUrl = await _exec( + `git config --get remote.${firstRemoteName}.url`, + ) + value = path.basename(remoteUrl, '.git') break } case 'tags':