X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-apply.c;h=e113c74dd80d458116788500baca2740cfaa9a00;hb=b642d9ef643371990c0a921836f2a074d48ce1b3;hp=69c8e6a6083456cb3e9c6389d49c7723b8854442;hpb=4868f3729acce2aa9512ded7179a895cc50f64c8;p=git.git

diff --git a/builtin-apply.c b/builtin-apply.c
index 69c8e6a6..e113c74d 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -8,6 +8,7 @@
  */
 #include <fnmatch.h>
 #include "cache.h"
+#include "cache-tree.h"
 #include "quote.h"
 #include "blob.h"
 #include "delta.h"
@@ -1935,6 +1936,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);
 	}
 	if (!cached)
 		unlink(patch->old_name);
@@ -2036,8 +2038,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)
@@ -2069,7 +2072,7 @@ static void write_out_results(struct patch *list, int skipped_patch)
 	}
 }
 
-static struct cache_file cache_file;
+static struct lock_file lock_file;
 
 static struct excludes {
 	struct excludes *next;
@@ -2130,8 +2133,12 @@ static int apply_patch(int fd, const char *filename)
 		apply = 0;
 
 	write_index = check_index && apply;
-	if (write_index && newfd < 0)
-		newfd = hold_index_file_for_update(&cache_file, get_index_file());
+	if (write_index && newfd < 0) {
+		newfd = hold_lock_file_for_update(&lock_file,
+						  get_index_file());
+		if (newfd < 0)
+			die("unable to create new index file");
+	}
 	if (check_index) {
 		if (read_cache() < 0)
 			die("unable to read index file");
@@ -2309,8 +2316,8 @@ int cmd_apply(int argc, const char **argv, char **envp)
 
 	if (write_index) {
 		if (write_cache(newfd, active_cache, active_nr) ||
-		    commit_index_file(&cache_file))
-			die("Unable to write new cachefile");
+		    commit_lock_file(&lock_file))
+			die("Unable to write new index file");
 	}
 
 	return 0;