X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=apply.c;h=acecf8de54e0446c16da2291de6d90b4606f3287;hb=ac92095ff2c47731ba9a2a7779cd797b973ffc74;hp=269210a578262b22fbf50bbdd9bf9fbccec3202b;hpb=72c159f642a33255b76fff512f2a8c3aff9f5dca;p=git.git

diff --git a/apply.c b/apply.c
index 269210a57..acecf8de5 100644
--- a/apply.c
+++ b/apply.c
@@ -8,6 +8,7 @@
  */
 #include <fnmatch.h>
 #include "cache.h"
+#include "cache-tree.h"
 #include "quote.h"
 #include "blob.h"
 
@@ -1717,6 +1718,7 @@ static void remove_file(struct patch *patch)
 	if (write_index) {
 		if (remove_file_from_cache(patch->old_name) < 0)
 			die("unable to remove %s from index", patch->old_name);
+		cache_tree_invalidate_path(active_cache_tree, patch->old_name);
 	}
 	unlink(patch->old_name);
 }
@@ -1813,8 +1815,9 @@ static void create_file(struct patch *patch)
 
 	if (!mode)
 		mode = S_IFREG | 0644;
-	create_one_file(path, mode, buf, size);	
+	create_one_file(path, mode, buf, size);
 	add_index_file(path, mode, buf, size);
+	cache_tree_invalidate_path(active_cache_tree, path);
 }
 
 static void write_out_one_result(struct patch *patch)