It doesn't make sense to sink below an unapplied patch

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/sink.py b/stgit/commands/sink.py
index 85cc70f58a2de577436721578c047dd31d99b862..2a18ebceb20bced0b52c980bda63f428bb140ba5 100644 (file)
--- a/stgit/commands/sink.py
+++ b/stgit/commands/sink.py
@@ -50,6 +50,10 @@ def func(parser, options, args):
     unapplied = crt_series.get_unapplied()
     all = unapplied + oldapplied
 
     unapplied = crt_series.get_unapplied()
     all = unapplied + oldapplied
 

+    if options.to and not options.to in oldapplied:
+        raise CmdException('Cannot sink below %s, since it is not applied'
+                           % options.to)
+

     if len(args) > 0:
         patches = parse_patches(args, all)
     else:
     if len(args) > 0:
         patches = parse_patches(args, all)
     else: