Peter Osterlund <[EMAIL PROTECTED]> wrote:
> Patches that add new files don't work correctly if git reports them
> with the 'A' flag. StGIT claims there are unresolved conflicts. This
> patch fixes it.
Thanks. Applied (together with the one below).
diff --git a/stgit/git.py b/stgit/git.py
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -292,7 +292,7 @@ def commit(message, files = [], parents
rm_files=[]
m_files=[]
for f in cache_files:
- if f[0] == 'N':
+ if f[0] in ['N', 'A']:
add_files.append(f[1])
elif f[0] == 'D':
rm_files.append(f[1])
@@ -437,7 +437,8 @@ def checkout(files = [], force = False):
def switch(tree_id):
"""Switch the tree to the given id
"""
- to_delete = filter(lambda x: x[0] == 'N', __tree_status(tree_id =
tree_id))+ to_delete = filter(lambda x: x[0] in ['N', 'A'],
+ __tree_status(tree_id = tree_id))
if __run('git-read-tree -m', [tree_id]) != 0:
raise GitException, 'Failed git-read-tree -m %s' % tree_id
--
Catalin
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
