X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-rm.c;fp=builtin-rm.c;h=ee8247b08cd007f73d5dfffa560a9efe33d327b9;hb=679639904da05f7d84e9215960e76dd0f3353328;hp=56454ec8f4ed0612aa8932c4d5a3294da6a1f4cd;hpb=03db4525d38119f7778d6e9117f27c47db8466d4;p=git.git diff --git a/builtin-rm.c b/builtin-rm.c index 56454ec8f..ee8247b08 100644 --- a/builtin-rm.c +++ b/builtin-rm.c @@ -146,11 +146,6 @@ int cmd_rm(int argc, const char **argv, const char *prefix) git_config(git_default_config, NULL); - newfd = hold_locked_index(&lock_file, 1); - - if (read_cache() < 0) - die("index file corrupt"); - argc = parse_options(argc, argv, builtin_rm_options, builtin_rm_usage, 0); if (!argc) usage_with_options(builtin_rm_usage, builtin_rm_options); @@ -158,6 +153,11 @@ int cmd_rm(int argc, const char **argv, const char *prefix) if (!index_only) setup_work_tree(); + newfd = hold_locked_index(&lock_file, 1); + + if (read_cache() < 0) + die("index file corrupt"); + pathspec = get_pathspec(prefix, argv); seen = NULL; for (i = 0; pathspec[i] ; i++)