diff options
| author | Aleix Pol <aleixpol@kde.org> | 2022-03-12 02:13:44 +0100 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2022-03-12 02:13:44 +0100 |
| commit | 56276c5ebe66c5431b7c1c6aa6a328ce7ed25a32 (patch) | |
| tree | 14444ca1ba545a4493295cd0ec58bab7cb8e19da | |
| parent | c958fdbc1b64b4591e434e5b6ae702e36b87af5c (diff) | |
| download | extra-cmake-modules-56276c5ebe66c5431b7c1c6aa6a328ce7ed25a32.tar.gz extra-cmake-modules-56276c5ebe66c5431b7c1c6aa6a328ce7ed25a32.tar.bz2 | |
Fix checking the repository name for detached remotes
If we are not tracking a specific branch, assume the remote is "origin"
which is git's default.
| -rw-r--r-- | kde-modules/KDECMakeSettings.cmake | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake index 319a8932..c991aa90 100644 --- a/kde-modules/KDECMakeSettings.cmake +++ b/kde-modules/KDECMakeSettings.cmake @@ -301,15 +301,19 @@ function(_repository_name reponame dir) OUTPUT_VARIABLE upstream_ref RESULT_VARIABLE exitCode WORKING_DIRECTORY "${dir}") - string(REGEX REPLACE "refs/remotes/([^/]+)/.*" "\\1" gitorigin "${upstream_ref}") if(exitCode EQUAL 0) + string(REGEX REPLACE "refs/remotes/([^/]+)/.*" "\\1" gitorigin "${upstream_ref}") message(DEBUG "Git upstream inferred as ${gitorigin}, upstream ref was ${upstream_ref}") - execute_process(COMMAND git remote get-url --all "${gitorigin}" - OUTPUT_VARIABLE giturl - RESULT_VARIABLE exitCode - WORKING_DIRECTORY "${dir}") + else() + set(gitorigin "origin") + message(DEBUG "Assuming origin as the git remote as we are in detached mode") endif() + execute_process(COMMAND git remote get-url --all "${gitorigin}" + OUTPUT_VARIABLE giturl + RESULT_VARIABLE exitCode + WORKING_DIRECTORY "${dir}") + if(exitCode EQUAL 0) message(DEBUG "Git URL inferred as ${giturl}") string(REGEX MATCHALL ".+kde\\.org[:\\/]([-A-Za-z0-9\\/]+)(.git)?\\s*" "" ${giturl}) |