X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=builtin-apply.c;fp=builtin-apply.c;h=f16c753bee7c1a1dda1952282f448d2d6a4099e6;hp=4056b9d67bc1c4e50563ceaa0ee68e94873a8e65;hb=0a2586c807fadc4b13a741e693471765870f6bb4;hpb=097dc3d8c32f4b85bf9701d5e1de98999ac25c1c diff --git a/builtin-apply.c b/builtin-apply.c index 4056b9d6..f16c753b 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -8,6 +8,7 @@ */ #include #include "cache.h" +#include "cache-tree.h" #include "quote.h" #include "blob.h" #include "delta.h" @@ -1918,6 +1919,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); @@ -2019,8 +2021,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)