From 774fc1e90859cc68926f4357347b0624d43f746f Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 3 May 2006 20:34:18 +0100 Subject: [PATCH] Allow git.checkout() to work on unmerged indexes If the index has unmerged entries, the current checkout implementation fails because of the -m option. This patch removes the option since it is not needed on tree_id is specified. This also allows "stg status --reset" to work on unmerged indexes. Signed-off-by: Catalin Marinas --- stgit/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stgit/git.py b/stgit/git.py index 8523455..6b14a74 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -612,7 +612,7 @@ def checkout(files = None, tree_id = None, force = False): if not files: files = [] - if tree_id and __run('git-read-tree -m', [tree_id]) != 0: + if tree_id and __run('git-read-tree', [tree_id]) != 0: raise GitException, 'Failed git-read-tree -m %s' % tree_id checkout_cmd = 'git-checkout-index -q -u' -- 2.11.0