utils: Ensure updates on the remote branch are applied for revison==HEAD

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-03-09 11:19:01 -08:00
parent 143e226c56
commit fde1417b5d

View File

@ -126,6 +126,8 @@ def fetchgitrepo(clonedir, repo, params, stashdir):
subprocess.check_call(["git", "clone", params["url"], sharedrepo]) subprocess.check_call(["git", "clone", params["url"], sharedrepo])
subprocess.check_call(["git", "checkout", branch], cwd=sharedrepo) subprocess.check_call(["git", "checkout", branch], cwd=sharedrepo)
# git reset revision==HEAD won't help, we need to reset onto the potentially fetched origin branch
subprocess.check_call(["git", "reset", "origin/" + branch, "--hard"], cwd=sharedrepo)
subprocess.check_call(["git", "reset", revision, "--hard"], cwd=sharedrepo) subprocess.check_call(["git", "reset", revision, "--hard"], cwd=sharedrepo)
def publishrepo(clonedir, repo, publishdir): def publishrepo(clonedir, repo, publishdir):