Disallow non-patch args to "stg show" (gna #8453).

[stgit] / stgit / commands / rebase.py

diff --git a/stgit/commands/rebase.py b/stgit/commands/rebase.py
index 2f0e660..c68f8e7 100644 (file)
--- a/stgit/commands/rebase.py
+++ b/stgit/commands/rebase.py
@@ -54,9 +54,9 @@ def func(parser, options, args):
 
     # ensure an exception is raised before popping on non-existent target
     if git_id(args[0]) == None:
-        raise GitException, 'Unknown revision: %s' % git_id
+        raise GitException, 'Unknown revision: %s' % args[0]
         
-    applied = prepare_rebase(real_rebase=True, force=options.force)
+    applied = prepare_rebase(force=options.force)
     rebase(args[0])
     post_rebase(applied, options.nopush, options.merged)