summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/utils/gitarchive.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/utils/gitarchive.py')
-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'