Fix "stg sink" with no applied patches (bug 11887)

There were two separate things to fix: bail out if we need a current
patch and there isn't one (because there are no applied patches), and
make sure we don't try to pop patches that don't exist.

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

diff --git a/stgit/commands/sink.py b/stgit/commands/sink.py
index 2167d873ba422e62ca41c5813bc02112e515c6bb..d8f79b4ecf0b67fd0b8e6fd215a541d5b8263b27 100644 (file)
--- a/stgit/commands/sink.py
+++ b/stgit/commands/sink.py
@@ -58,9 +58,13 @@ def func(parser, options, args):
     if len(args) > 0:
         patches = parse_patches(args, all)
     else:
     if len(args) > 0:
         patches = parse_patches(args, all)
     else:

-        patches = [ crt_series.get_current() ]
+        current = crt_series.get_current()
+        if not current:
+            raise CmdException('No patch applied')
+        patches = [current]

 
 

-    crt_series.pop_patch(options.to or oldapplied[0])
+    if oldapplied:
+        crt_series.pop_patch(options.to or oldapplied[0])

     push_patches(crt_series, patches)
 
     if not options.nopush:
     push_patches(crt_series, patches)
 
     if not options.nopush:

diff --git a/t/t1501-sink.sh b/t/t1501-sink.sh
index 3872c4b0af13093bc80e5d475318c0c6cccb88d4..6af45fedff1536acc557f172c316c3650ccc0873 100755 (executable)
--- a/t/t1501-sink.sh
+++ b/t/t1501-sink.sh
@@ -20,7 +20,7 @@ test_expect_success 'sink without applied patches' '
     ! stg sink
 '
 
     ! stg sink
 '
 

-test_expect_failure 'sink a specific patch without applied patches' '
+test_expect_success 'sink a specific patch without applied patches' '

     stg sink y &&
     test $(echo $(stg applied)) = "y"
 '
     stg sink y &&
     test $(echo $(stg applied)) = "y"
 '