aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-12-08 19:07:23 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-12-08 19:07:23 +0200
commitf5a1f9d8c445e5ee325b38b81f83f4703185cafc (patch)
treecad8afa5aae4265373d7888032d785bda5be0417
parent211facc09aa6f980a6b486929a842b75e15d734e (diff)
manage.py: checkout commit in commit_patch()
Do 'checkout' instead of 'reset --hard' as that fails on some old versions of git if HEAD points to a non-existent ref (i.e. orphan __tmp__ branch in our case). Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-xmanage.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/manage.py b/manage.py
index d883e8a..b061108 100755
--- a/manage.py
+++ b/manage.py
@@ -293,7 +293,7 @@ def commit_patch(commit, patchfile):
tree = git_cmd('write-tree', None, True, None, env)[0]
assert tree == commit['tree']
sha1 = commit_tree(commit)
- git_cmd('reset', ['--hard'], True)
+ git_cmd('checkout', [sha1], True)
return sha1