diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-14 01:19:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-14 01:19:30 -0700 |
| commit | 58f6fb53dd1104559f6f5507562a975c0ff079af (patch) | |
| tree | e5d6efb5312abab35abf8a7b18aacc61776c6592 /builtin-apply.c | |
| parent | cbb390cd8f58ca6fc5c7b2c710425649b057b6d6 (diff) | |
| parent | 09d5dc32fbdfa7bfd23fe377455445dd2605c3b9 (diff) | |
| download | git-58f6fb53dd1104559f6f5507562a975c0ff079af.tar.gz git-58f6fb53dd1104559f6f5507562a975c0ff079af.tar.xz | |
Merge branch 'jc/cachetree' into cr/reset
* jc/cachetree:
Simplify cache API
git-format-patch --in-reply-to: accept <message@id> with angle brackets
git-add -u: do not barf on type changes
Remove duplicate note about removing commits with git-filter-branch
git-clone: improve error message if curl program is missing or not executable
git.el: Allow the add and remove commands to be applied to ignored files.
git.el: Allow selecting whether to display uptodate/unknown/ignored files.
git.el: Keep the status buffer sorted by filename.
hooks--update: Explicitly check for all zeros for a deleted ref.
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 976ec7704..79a4852bc 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2394,7 +2394,6 @@ static void remove_file(struct patch *patch, int rmdir_empty) if (update_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) { if (S_ISGITLINK(patch->old_mode)) { @@ -2549,7 +2548,6 @@ static void create_file(struct patch *patch) mode = S_IFREG | 0644; create_one_file(path, mode, buf, size); add_index_file(path, mode, buf, size); - cache_tree_invalidate_path(active_cache_tree, path); } /* phase zero is to remove, phase one is to create */ |