Check for uppercase 'head' when updating subprojects

master
andy5995 2 weeks ago committed by Jussi Pakkanen
parent bfce1450ac
commit f0851c9e4b
  1. 4
      docs/markdown/Wrap-dependency-system-manual.md
  2. 3
      mesonbuild/msubprojects.py

@ -66,7 +66,7 @@ An example wrap-git will look like this:
```ini ```ini
[wrap-git] [wrap-git]
url = https://github.com/libfoobar/libfoobar.git url = https://github.com/libfoobar/libfoobar.git
revision = head revision = HEAD
depth = 1 depth = 1
``` ```
@ -124,7 +124,7 @@ case, the directory will be copied into `subprojects/` before applying patches.
- `url` - name of the wrap-git repository to clone. Required. - `url` - name of the wrap-git repository to clone. Required.
- `revision` - name of the revision to checkout. Must be either: a - `revision` - name of the revision to checkout. Must be either: a
valid value (such as a git tag) for the VCS's `checkout` command, or valid value (such as a git tag) for the VCS's `checkout` command, or
(for git) `head` to track upstream's default branch. Required. (for git) `HEAD` to track upstream's default branch. Required.
### Specific to wrap-git ### Specific to wrap-git
- `depth` - shallowly clone the repository to X number of commits. This saves bandwidth and disk - `depth` - shallowly clone the repository to X number of commits. This saves bandwidth and disk

@ -324,7 +324,8 @@ class Runner:
self.log(' -> Not a git repository.') self.log(' -> Not a git repository.')
self.log('Pass --reset option to delete directory and redownload.') self.log('Pass --reset option to delete directory and redownload.')
return False return False
revision = self.wrap.values.get('revision') revision_val = self.wrap.values.get('revision')
revision = revision_val if revision_val.upper() != 'HEAD' else 'HEAD'
url = self.wrap.values.get('url') url = self.wrap.values.get('url')
push_url = self.wrap.values.get('push-url') push_url = self.wrap.values.get('push-url')
if not revision or not url: if not revision or not url:

Loading…
Cancel
Save