OrgZephyr/west
OrgZephyr
/
west
mirror of https://github.com/zephyrproject-rtos/west.git
1
0
Fork 0
Code Issues Releases Wiki Activity

project: Fixed issue with fetching revision SHA 

Fixes: #139

Fixes the issue of fetching SHAs when specified in manifest file.
It is checked if a revision is a SHA, in which case the fetch is
performed on the url and afterwards the manifest-rev reference is
updated to the SHA.

Signed-off-by: Torsten Rasmussen <torsten.rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2018-12-11 16:01:43 +01:00 committed by Marti Bolivar
parent 8b4a08d6ac
commit 9874122997
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/west/commands/project.py
View File

@ -710,8 +710,13 @@ def _fetch(project):
# separately.
#
# --tags is required to get tags when the remote is specified as an URL.
_git(project, fetch_cmd + ' --tags -- (url) (revision)')
_git(project, 'update-ref (qual-manifest-rev-branch) FETCH_HEAD^{commit}')
if _is_sha(project.revision):
# Don't fetch a SHA directly, as server may restrict from doing so.
_git(project, fetch_cmd + ' --tags -- (url)')
_git(project, 'update-ref (qual-manifest-rev-branch) (revision)')
else:
_git(project, fetch_cmd + ' --tags -- (url) (revision)')
_git(project, 'update-ref (qual-manifest-rev-branch) FETCH_HEAD^{commit}')
if not _head_ok(project):
# If nothing it checked out (which would usually only happen just after