summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 09:26:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 09:28:28 +0000
commit9fdd172fb0cf9fdd270744c11afdfcd5a0ddc954 (patch)
tree97f2d9ce5dc9653cadeebd97684fc9aed8e227a9
parent47eb3d00e9d6a66aee1283dab29af8117a006d6d (diff)
downloadpoky-9fdd172fb0cf9fdd270744c11afdfcd5a0ddc954.tar.gz
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. (From OE-Core rev: 0ee636bc89d93282cb3d3cd747b3dd046f6e5a9c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/gitarchive.py4
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):
80 80
81 # Create new commit object from the tree 81 # Create new commit object from the tree
82 parent = repo.rev_parse(branch) 82 parent = repo.rev_parse(branch)
83 if not parent:
84 parent = repo.rev_parse("origin/" + branch)
83 git_cmd = ['commit-tree', tree, '-m', message] 85 git_cmd = ['commit-tree', tree, '-m', message]
84 if parent: 86 if parent:
85 git_cmd += ['-p', parent] 87 git_cmd += ['-p', parent]
@@ -93,8 +95,6 @@ def git_commit_data(repo, data_dir, branch, message, exclude, notes, log):
93 95
94 # Update branch head 96 # Update branch head
95 git_cmd = ['update-ref', 'refs/heads/' + branch, commit] 97 git_cmd = ['update-ref', 'refs/heads/' + branch, commit]
96 if parent:
97 git_cmd.append(parent)
98 repo.run_cmd(git_cmd) 98 repo.run_cmd(git_cmd)
99 99
100 # Update current HEAD, if we're on branch 'branch' 100 # Update current HEAD, if we're on branch 'branch'