remove extra refresh_index() call in apply_patches()

apply_patches() calles git.merge() and git.switch(), both of which already
invoke refresh_index().

Signed-off-by: Chuck Lever <cel@netapp.com>

diff --git a/stgit/git.py b/stgit/git.py
index a615ccf8bb8dcecb9a237deb01fe6953d35bdb07..0cdc125995af1b7ab4e950bd41b740deeef5b093 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -638,11 +638,11 @@ def apply_patch(filename = None, base = None):
                 return False
             return True
 
                 return False
             return True
 

-    refresh_index()
-

     if base:
         orig_head = get_head()
         switch(base)
     if base:
         orig_head = get_head()
         switch(base)

+    else:
+        refresh_index()         # needed since __apply_patch() doesn't do it

 
     if not __apply_patch():
         if base:
 
     if not __apply_patch():
         if base: