diff options
author | Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2021-07-28 15:16:30 +0100 |
---|---|---|
committer | Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2021-09-27 15:41:24 +0100 |
commit | 1dad57d47614546240061fd942d1ff8e6e54eb64 (patch) | |
tree | 8d6cd6d8761817187ad6aa6190e606f84fd75d5a /toolchain | |
parent | 3df459ce8233f755c7eebc2b67f0ca6465ebd927 (diff) | |
download | extra-cmake-modules-1dad57d47614546240061fd942d1ff8e6e54eb64.tar.gz extra-cmake-modules-1dad57d47614546240061fd942d1ff8e6e54eb64.tar.bz2 |
Handle git remotes that aren't called origin in _repository_name()
I was seeing `error: No such remote 'origin'` in the cmake output.
This commit avoids hardcoding `origin` as the upstream URL and instead
uses the `git rev-parse @{u}` to get the configured upstream.
As a follow-up we may want to check if this should be executed by default,
but for now this fixes a warning that I'm seeing with various projects.
Diffstat (limited to 'toolchain')
-rwxr-xr-x | toolchain/generate-fastlane-metadata.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/toolchain/generate-fastlane-metadata.py b/toolchain/generate-fastlane-metadata.py index f39acc3a..642a76d3 100755 --- a/toolchain/generate-fastlane-metadata.py +++ b/toolchain/generate-fastlane-metadata.py @@ -339,7 +339,9 @@ def processAppstreamFile(appstreamFileName, desktopFileName, iconBaseName): # Try to figure out the source repository if arguments.source and os.path.exists(os.path.join(arguments.source, '.git')): - output = subprocess.check_output('git remote show -n origin', shell=True, cwd = arguments.source).decode('utf-8') + upstream_ref = subprocess.check_output(['git', 'rev-parse', '--symbolic-full-name', '@{u}'], cwd=arguments.source).decode('utf-8') + remote = upstream_ref.split('/')[2] + output = subprocess.check_output(['git', 'remote', 'show', '-n', remote], cwd=arguments.source).decode('utf-8') result = re.search(' Fetch URL: (.*)\n', output) data['source-repo'] = result.group(1) |