From f5a1f9d8c445e5ee325b38b81f83f4703185cafc Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Tue, 8 Dec 2015 19:07:23 +0200 Subject: 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 --- manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3