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-mv.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-mv.c')
-rw-r--r-- | builtin-mv.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin-mv.c b/builtin-mv.c index 3563216ac..b95b7d286 100644 --- a/builtin-mv.c +++ b/builtin-mv.c @@ -276,11 +276,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix) add_file_to_cache(path, verbose); } - for (i = 0; i < deleted.nr; i++) { - const char *path = deleted.items[i].path; - remove_file_from_cache(path); - cache_tree_invalidate_path(active_cache_tree, path); - } + for (i = 0; i < deleted.nr; i++) + remove_file_from_cache(deleted.items[i].path); if (active_cache_changed) { if (write_cache(newfd, active_cache, active_nr) || |