X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/8d4155530f85a38980acdd6c5716e6f684c4d79f..06848faba60e1c4e637b15b608e5bd94989c4196:/stgit/git.py

diff --git a/stgit/git.py b/stgit/git.py
index 21d74dd..eb8da4e 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -262,10 +262,10 @@ def __tree_status(files = None, tree_id = 'HEAD', unknown = False,
 
     return cache_files
 
-def local_changes():
+def local_changes(verbose = True):
     """Return true if there are local changes in the tree
     """
-    return len(__tree_status(verbose = True)) != 0
+    return len(__tree_status(verbose = verbose)) != 0
 
 # HEAD value cached
 __head = None
@@ -814,12 +814,6 @@ def apply_patch(filename = None, diff = None, base = None,
     """Apply a patch onto the current or given index. There must not
     be any local changes in the tree, otherwise the command fails
     """
-    if base:
-        orig_head = get_head()
-        switch(base)
-    else:
-        refresh_index()
-
     if diff is None:
         if filename:
             f = file(filename)
@@ -829,6 +823,12 @@ def apply_patch(filename = None, diff = None, base = None,
         if filename:
             f.close()
 
+    if base:
+        orig_head = get_head()
+        switch(base)
+    else:
+        refresh_index()
+
     try:
         _input_str('git-apply --index', diff)
     except GitException:
@@ -839,6 +839,7 @@ def apply_patch(filename = None, diff = None, base = None,
             f = file('.stgit-failed.patch', 'w+')
             f.write(diff)
             f.close()
+            print >> sys.stderr, 'Diff written to the .stgit-failed.patch file'
 
         raise