~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Allow git.checkout() to work on unmerged indexes
[stgit]
/
stgit
/
git.py
diff --git
a/stgit/git.py
b/stgit/git.py
index
8523455
..
6b14a74
100644
(file)
--- 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'