diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-18 00:42:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-18 00:42:01 -0700 |
| commit | 9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e (patch) | |
| tree | d49794a304c2b949d9a49e56b7e5028cce44e406 /builtin-apply.c | |
| parent | 148c63006a8e4985a9eee0863073588d8ac18a8a (diff) | |
| parent | 58f6fb53dd1104559f6f5507562a975c0ff079af (diff) | |
| download | git-9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e.tar.gz git-9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e.tar.xz | |
Merge branch 'cr/reset'
* cr/reset:
Simplify cache API
An additional test for "git-reset -- path"
Make "git reset" a builtin.
Move make_cache_entry() from merge-recursive.c into read-cache.c
Add tests for documented features of "git reset".
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 5ad371424..05ce2205f 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2423,7 +2423,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)) { @@ -2578,7 +2577,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 */ |