Fix a small memory leak in builtin-add

diff --git a/builtin-rm.c b/builtin-rm.c
index d3de4b54524cc616b12353a180e821ec57c27f1a..9a808c1bf96ec52d836b0a69816f6118f0291a45 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -10,7 +10,7 @@
 #include "tree-walk.h"
 
 static const char builtin_rm_usage[] =
-"git-rm [-f] [-n] [-r] [--cached] [--quiet] [--] <file>...";
+"git-rm [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...";
 
 static struct {
        int nr, alloc;
@@ -46,7 +46,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 +65,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,14 +89,32 @@ 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;
 }
@@ -105,6 +125,7 @@ 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;
 
@@ -134,6 +155,8 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
                        recursive = 1;
                else if (!strcmp(arg, "--quiet"))
                        quiet = 1;
+               else if (!strcmp(arg, "--ignore-unmatch"))
+                       ignore_unmatch = 1;
                else
                        usage(builtin_rm_usage);
        }
@@ -155,14 +178,24 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 
        if (pathspec) {
                const char *match;
+               int seen_any = 0;
                for (i = 0; (match = pathspec[i]) != NULL ; i++) {
-                       if (!seen[i])
-                               die("pathspec '%s' did not match any files",
-                                   match);
+                       if (!seen[i]) {
+                               if (!ignore_unmatch) {
+                                       die("pathspec '%s' did not match any files",
+                                           match);
+                               }
+                       }
+                       else {
+                               seen_any = 1;
+                       }
                        if (!recursive && seen[i] == MATCHED_RECURSIVELY)
                                die("not removing '%s' recursively without -r",
                                    *match ? match : ".");
                }
+
+               if (! seen_any)
+                       exit(0);
        }
 
        /*
@@ -170,7 +203,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
         * must match; but the file can already been removed, since
         * this sequence is a natural "novice" way:
         *
-        *      rm F; git fm F
+        *      rm F; git rm F
         *
         * Further, if HEAD commit exists, "diff-index --cached" must
         * report no changes unless forced.
@@ -179,7 +212,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);
        }