From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 28 May 2008 21:02:02 +0000 (+0100)
Subject: Fix error in status.py when calling git.resolved
X-Git-Tag: v0.15-rc1~221
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/6ce2faa0ac6e5de67cedee09e257e69f9ebff1e8

Fix error in status.py when calling git.resolved

It was using a generator instead of a list and it failed later in
Run.xargs().

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---

diff --git a/stgit/commands/status.py b/stgit/commands/status.py
index 6da4516..a5b2f88 100644
--- a/stgit/commands/status.py
+++ b/stgit/commands/status.py
@@ -108,7 +108,7 @@ def func(parser, options, args):
     if options.reset:
         if args:
             conflicts = git.get_conflicts()
-            git.resolved(fn for fn in args if fn in conflicts)
+            git.resolved([fn for fn in args if fn in conflicts])
             git.reset(args)
         else:
             resolved_all()