Bomb out when --ack and --sign are both passed to "refresh".

[stgit] / stgit / commands / refresh.py

diff --git a/stgit/commands/refresh.py b/stgit/commands/refresh.py
index 610d18a9497a2cf8e357b0f29eed04b94bf01fa4..2949ecbc6eae8bd3fee5f59a6e889b5766f17be9 100644 (file)
--- a/stgit/commands/refresh.py
+++ b/stgit/commands/refresh.py
@@ -99,6 +99,8 @@ def func(parser, options, args):
 
     if options.sign:
         sign_str = 'Signed-off-by'
 
     if options.sign:
         sign_str = 'Signed-off-by'

+        if options.ack:
+            raise CmdException, '--ack and --sign were both specified'

     elif options.ack:
         sign_str = 'Acked-by'
     else:
     elif options.ack:
         sign_str = 'Acked-by'
     else: