From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Tue, 8 Dec 2015 17:07:23 +0000 (+0200)
Subject: manage.py: checkout commit in commit_patch()
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5a1f9d8c445e5ee325b38b81f83f4703185cafc;p=tools%2Fgit-buildpackage-rpm-testdata.git

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>
---

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