builtin-blame: set up the work_tree before the first file access
[gitweb.git] / builtin-rm.c
index 4a0bd93c8b3b644fb86ce05686b09d79b180bffc..a3d25e6a571584c486d252c5a8e2b182f3da86e3 100644 (file)
@@ -8,9 +8,12 @@
 #include "dir.h"
 #include "cache-tree.h"
 #include "tree-walk.h"
+#include "parse-options.h"
 
-static const char builtin_rm_usage[] =
-"git-rm [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...";
+static const char * const builtin_rm_usage[] = {
+       "git-rm [options] [--] <file>...",
+       NULL
+};
 
 static struct {
        int nr, alloc;
@@ -46,7 +49,7 @@ static int remove_file(const char *name)
        return ret;
 }
 
-static int check_local_mod(unsigned char *head)
+static int check_local_mod(unsigned char *head, int index_only)
 {
        /* items in list are already sorted in the cache order,
         * so we could do this a lot more efficiently by using
@@ -65,6 +68,8 @@ static int check_local_mod(unsigned char *head)
                const char *name = list.name[i];
                unsigned char sha1[20];
                unsigned mode;
+               int local_changes = 0;
+               int staged_changes = 0;
 
                pos = cache_name_pos(name, strlen(name));
                if (pos < 0)
@@ -87,25 +92,55 @@ static int check_local_mod(unsigned char *head)
                        continue;
                }
                if (ce_match_stat(ce, &st, 0))
-                       errs = error("'%s' has local modifications "
-                                    "(hint: try -f)", ce->name);
+                       local_changes = 1;
                if (no_head
                     || get_tree_entry(head, name, sha1, &mode)
                     || ce->ce_mode != create_ce_mode(mode)
                     || hashcmp(ce->sha1, sha1))
-                       errs = error("'%s' has changes staged in the index "
-                                    "(hint: try -f)", name);
+                       staged_changes = 1;
+
+               if (local_changes && staged_changes)
+                       errs = error("'%s' has staged content different "
+                                    "from both the file and the HEAD\n"
+                                    "(use -f to force removal)", name);
+               else if (!index_only) {
+                       /* It's not dangerous to git-rm --cached a
+                        * file if the index matches the file or the
+                        * HEAD, since it means the deleted content is
+                        * still available somewhere.
+                        */
+                       if (staged_changes)
+                               errs = error("'%s' has changes staged in the index\n"
+                                            "(use --cached to keep the file, "
+                                            "or -f to force removal)", name);
+                       if (local_changes)
+                               errs = error("'%s' has local modifications\n"
+                                            "(use --cached to keep the file, "
+                                            "or -f to force removal)", name);
+               }
        }
        return errs;
 }
 
 static struct lock_file lock_file;
 
+static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;
+static int ignore_unmatch = 0;
+
+static struct option builtin_rm_options[] = {
+       OPT__DRY_RUN(&show_only),
+       OPT__QUIET(&quiet),
+       OPT_BOOLEAN( 0 , "cached",         &index_only, "only remove from the index"),
+       OPT_BOOLEAN('f', NULL,             &force,      "override the up-to-date check"),
+       OPT_BOOLEAN('r', NULL,             &recursive,  "allow recursive removal"),
+       OPT_BOOLEAN( 0 , "ignore-unmatch", &ignore_unmatch,
+                               "exit with a zero status even if nothing matched"),
+       OPT_END(),
+};
+
 int cmd_rm(int argc, const char **argv, const char *prefix)
 {
        int i, newfd;
-       int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;
-       int ignore_unmatch = 0;
        const char **pathspec;
        char *seen;
 
@@ -116,34 +151,14 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
        if (read_cache() < 0)
                die("index file corrupt");
 
-       for (i = 1 ; i < argc ; i++) {
-               const char *arg = argv[i];
+       argc = parse_options(argc, argv, builtin_rm_options, builtin_rm_usage, 0);
+       if (!argc)
+               usage_with_options(builtin_rm_usage, builtin_rm_options);
 
-               if (*arg != '-')
-                       break;
-               else if (!strcmp(arg, "--")) {
-                       i++;
-                       break;
-               }
-               else if (!strcmp(arg, "-n"))
-                       show_only = 1;
-               else if (!strcmp(arg, "--cached"))
-                       index_only = 1;
-               else if (!strcmp(arg, "-f"))
-                       force = 1;
-               else if (!strcmp(arg, "-r"))
-                       recursive = 1;
-               else if (!strcmp(arg, "--quiet"))
-                       quiet = 1;
-               else if (!strcmp(arg, "--ignore-unmatch"))
-                       ignore_unmatch = 1;
-               else
-                       usage(builtin_rm_usage);
-       }
-       if (argc <= i)
-               usage(builtin_rm_usage);
+       if (!index_only)
+               setup_work_tree();
 
-       pathspec = get_pathspec(prefix, argv + i);
+       pathspec = get_pathspec(prefix, argv);
        seen = NULL;
        for (i = 0; pathspec[i] ; i++)
                /* nothing */;
@@ -192,7 +207,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
                unsigned char sha1[20];
                if (get_sha1("HEAD", sha1))
                        hashclr(sha1);
-               if (check_local_mod(sha1))
+               if (check_local_mod(sha1, index_only))
                        exit(1);
        }
 
@@ -207,7 +222,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)