From 77f1965113e8b2b22c8bdb704205f9264e59c47f Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Fri, 15 Mar 2013 15:42:42 -0400
Subject: [PATCH] stash: bugfix: respect options that follow operation (ex:
 --pop -k)

---
 jsvn | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/jsvn b/jsvn
index ea4305e..72b73d0 100755
--- a/jsvn
+++ b/jsvn
@@ -1539,15 +1539,16 @@ def stash_h(argv, svn, out, config):
     keep = False
     patch = False
     externals = config['stash_externals']
+    operation = 'save'
     for opt, arg in opts:
         if opt == '--list':
-            return stash_list_h(args, svn, out, config)
+            operation = 'list'
         elif opt == '--pop':
-            return stash_pop_h(args, svn, out, config, keep)
+            operation = 'pop'
         elif opt == '--show':
-            return stash_show_h(args, svn, out, config)
+            operation = 'show'
         elif opt == '--drop':
-            return stash_drop_h(args, svn, out, config)
+            operation = 'drop'
         elif opt in ('-k', '--keep'):
             keep = True
         elif opt in ('-p', '--patch'):
@@ -1556,6 +1557,14 @@ def stash_h(argv, svn, out, config):
             externals = True
         elif opt == '--noexternals':
             externals = False
+    if operation == 'list':
+        return stash_list_h(args, svn, out, config)
+    elif operation == 'pop':
+        return stash_pop_h(args, svn, out, config, keep)
+    elif operation == 'show':
+        return stash_show_h(args, svn, out, config)
+    elif operation == 'drop':
+        return stash_drop_h(args, svn, out, config)
     return stash_save_h(args, svn, out, config, keep, patch, externals)
 
 def root_h(argv, svn, out, config):