From: Chuck Lever <cel@netapp.com>
Date: Wed, 2 Nov 2005 21:55:35 +0000 (-0500)
Subject: remove extra refresh_index() call in apply_patches()
X-Git-Tag: v0.8~34
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/e1db88d02ed4fbb0cb38c90ce6f9cd7416747d69

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 a615ccf..0cdc125 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -638,11 +638,11 @@ def apply_patch(filename = None, base = None):
                 return False
             return True
 
-    refresh_index()
-
     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: