Since we now use the same conflict metadata as git (that is, the
index), "stg status --reset" is equivalent to "git checkout
<filename>" or "git reset --hard". And duplicating git commands with a
different name is just confusing.
Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx>
---
stgit/commands/status.py | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/stgit/commands/status.py b/stgit/commands/status.py
index 0d7e5ab..bb665be 100644
--- a/stgit/commands/status.py
+++ b/stgit/commands/status.py
@@ -59,28 +59,17 @@ options = [make_option('-m', '--modified',
help = 'do not exclude any files from listing',
action = 'store_true'),
make_option('-O', '--diff-opts',
- help = 'options to pass to git-diff'),
- make_option('--reset',
- help = 'reset the current tree changes',
- action = 'store_true')]
+ help = 'options to pass to git-diff')]
def func(parser, options, args):
"""Show the tree status
"""
- if options.reset:
- if args:
- resolved(args)
- git.reset(args)
- else:
- resolved_all()
- git.reset()
+ if options.diff_opts:
+ diff_flags = options.diff_opts.split()
else:
- if options.diff_opts:
- diff_flags = options.diff_opts.split()
- else:
- diff_flags = []
+ diff_flags = []
- git.status(args, options.modified, options.new, options.deleted,
- options.conflict, options.unknown, options.noexclude,
- diff_flags = diff_flags)
+ git.status(args, options.modified, options.new, options.deleted,
+ options.conflict, options.unknown, options.noexclude,
+ diff_flags = diff_flags)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
