diff options
| author | Mike Hommey <mh@glandium.org> | 2007-11-03 12:23:13 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-05 22:47:57 -0800 |
| commit | 271bb08735435b859464c22506ba512f003a4191 (patch) | |
| tree | 56b023aea0d669eb73f7126a244e7f43305168a9 | |
| parent | 7d8ae93292e2cd862359f02879a0c954faf8afa8 (diff) | |
| download | git-271bb08735435b859464c22506ba512f003a4191.tar.gz git-271bb08735435b859464c22506ba512f003a4191.tar.xz | |
Don't always require working tree for git-rm
This allows to do git rm --cached -r directory, instead of
git ls-files -z directory | git update-index --remove -z --stdin.
This can be particularly useful for git-filter-branch users.
Signed-off-by: Mike Hommey <mh@glandium.org>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-rm.c | 3 | ||||
| -rw-r--r-- | git.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/builtin-rm.c b/builtin-rm.c index bca2bd970..a3d25e6a5 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -155,6 +155,9 @@ int cmd_rm(int argc, const char **argv, const char *prefix) if (!argc) usage_with_options(builtin_rm_usage, builtin_rm_options); + if (!index_only) + setup_work_tree(); + pathspec = get_pathspec(prefix, argv); seen = NULL; for (i = 0; pathspec[i] ; i++) @@ -340,7 +340,7 @@ static void handle_internal_command(int argc, const char **argv) { "rev-list", cmd_rev_list, RUN_SETUP }, { "rev-parse", cmd_rev_parse, RUN_SETUP }, { "revert", cmd_revert, RUN_SETUP | NEED_WORK_TREE }, - { "rm", cmd_rm, RUN_SETUP | NEED_WORK_TREE }, + { "rm", cmd_rm, RUN_SETUP }, { "runstatus", cmd_runstatus, RUN_SETUP | NEED_WORK_TREE }, { "shortlog", cmd_shortlog, RUN_SETUP | USE_PAGER }, { "show-branch", cmd_show_branch, RUN_SETUP }, |