diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 09:26:42 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-24 21:23:54 +0000 |
| commit | 36624a17d382d84647c5811134fe76251fd64dc3 (patch) | |
| tree | 2ba953560bc32819a507d43bcb2780b351dcf50d | |
| parent | c4c63cdc1eca2acebc4ec9486b0d0592e47a8ae2 (diff) | |
| download | openembedded-core-36624a17d382d84647c5811134fe76251fd64dc3.tar.gz openembedded-core-36624a17d382d84647c5811134fe76251fd64dc3.tar.bz2 openembedded-core-36624a17d382d84647c5811134fe76251fd64dc3.zip | |
oeqa/utils/gitarchive: Handle case where parent is only on origin
The parent code currently assumed that any parent branch is locally
checked out which may not be the case.
Use the local branch by default but fall back to the origin. This
also means removing the later saftey check as the branch may not exist
locally.
This fixes the autobuilder resulttool test pushing code.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/utils/gitarchive.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py index ff614d06bb..9520b2e126 100644 --- a/meta/lib/oeqa/utils/gitarchive.py +++ b/meta/lib/oeqa/utils/gitarchive.py @@ -80,6 +80,8 @@ def git_commit_data(repo, data_dir, branch, message, exclude, notes, log): # Create new commit object from the tree parent = repo.rev_parse(branch) + if not parent: + parent = repo.rev_parse("origin/" + branch) git_cmd = ['commit-tree', tree, '-m', message] if parent: git_cmd += ['-p', parent] @@ -93,8 +95,6 @@ def git_commit_data(repo, data_dir, branch, message, exclude, notes, log): # Update branch head git_cmd = ['update-ref', 'refs/heads/' + branch, commit] - if parent: - git_cmd.append(parent) repo.run_cmd(git_cmd) # Update current HEAD, if we're on branch 'branch' |