~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass --directory to git-ls-files for stg status
[stgit]
/
stgit
/
main.py
diff --git
a/stgit/main.py
b/stgit/main.py
index
008912b
..
d96ff2e
100644
(file)
--- a/
stgit/main.py
+++ b/
stgit/main.py
@@
-22,7
+22,7
@@
import sys, os
from optparse import OptionParser, make_option
from stgit.utils import *
from optparse import OptionParser, make_option
from stgit.utils import *
-from stgit import stack, git
+from stgit import stack, git
, gitmergeonefile
from stgit.version import version
from stgit.config import config
from stgit.commands.common import *
from stgit.version import version
from stgit.config import config
from stgit.commands.common import *
@@
-183,8
+183,8
@@
def main():
stgit.commands.common.crt_series = command.crt_series
command.func(parser, options, args)
stgit.commands.common.crt_series = command.crt_series
command.func(parser, options, args)
- except (IOError, CmdException, stack.StackException, git.GitException
), \
-
err:
+ except (IOError, CmdException, stack.StackException, git.GitException
,
+
gitmergeonefile.GitMergeException),
err:
print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
sys.exit(2)
except KeyboardInterrupt:
print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
sys.exit(2)
except KeyboardInterrupt: