Skip to content

Commit

Permalink
Check for uppercase 'head' when updating subprojects
Browse files Browse the repository at this point in the history
  • Loading branch information
andy5995 authored and jpakkane committed Nov 6, 2024
1 parent bfce145 commit f0851c9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/markdown/Wrap-dependency-system-manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ An example wrap-git will look like this:
```ini
[wrap-git]
url = https://github.com/libfoobar/libfoobar.git
revision = head
revision = HEAD
depth = 1
```

Expand Down Expand Up @@ -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.
- `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
(for git) `head` to track upstream's default branch. Required.
(for git) `HEAD` to track upstream's default branch. Required.

### Specific to wrap-git
- `depth` - shallowly clone the repository to X number of commits. This saves bandwidth and disk
Expand Down
3 changes: 2 additions & 1 deletion mesonbuild/msubprojects.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,8 @@ def update_git(self) -> bool:
self.log(' -> Not a git repository.')
self.log('Pass --reset option to delete directory and redownload.')
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')
push_url = self.wrap.values.get('push-url')
if not revision or not url:
Expand Down

0 comments on commit f0851c9

Please sign in to comment.