Hi,
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.
Signed-off-by: Peter Osterlund <[EMAIL PROTECTED]>
diff --git a/stgit/git.py b/stgit/git.py
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -274,7 +274,7 @@ def commit(message, files = [], parents
raise GitException, 'No changes to commit'
# check for unresolved conflicts
- if not first and len(filter(lambda x: x[0] not in ['M', 'N', 'D'],
+ if not first and len(filter(lambda x: x[0] not in ['M', 'N', 'A', 'D'],
cache_files)) != 0:
raise GitException, 'Commit failed: unresolved conflicts'
--
Peter Osterlund - [EMAIL PROTECTED]
http://web.telia.com/~u89404340
-
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
