From e8fe0efcdb3215f2ef0ce4249ecf06101ddcddd2 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Mon, 11 Mar 2013 21:22:03 -0400
Subject: [PATCH] stash: rework bugfixes

---
 jsvn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jsvn b/jsvn
index 1314398..e2719a2 100755
--- a/jsvn
+++ b/jsvn
@@ -1322,6 +1322,8 @@ q: quit and abort stash
         svars['hunk_buildup'] = ''
         svars['index_fname'] = new_file_name
         svars['binary_file'] = False
+        svars['wrote_index_sf'] = False
+        svars['wrote_index_rf'] = False
 
     diff_proc = Popen([svn, 'diff'] + targets, stdout=PIPE)
     for line in iter(diff_proc.stdout.readline, ''):
@@ -1342,7 +1344,8 @@ q: quit and abort stash
             svars['hunk_buildup'] += line
         if svars['quit']:
             break
-    flush_file('')
+    if not svars['quit']:
+        flush_file('')
 
     s_fh.close()
     r_fh.close()