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-rm.c | |
parent | 148c63006a8e4985a9eee0863073588d8ac18a8a (diff) | |
parent | 58f6fb53dd1104559f6f5507562a975c0ff079af (diff) | |
download | git-9346b4e1ad2d03541f18b38f7e9fb7ad0ca6434e.tar.gz |
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-rm.c')
-rw-r--r-- | builtin-rm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin-rm.c b/builtin-rm.c index 9a808c1bf9..3b0677e44b 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -227,7 +227,6 @@ int cmd_rm(int argc, const char **argv, const char *prefix) if (remove_file_from_cache(path)) die("git-rm: unable to remove %s", path); - cache_tree_invalidate_path(active_cache_tree, path); } if (show_only) |