Merge branch 'rs/rebase'

[git.git] / builtin-rm.c

diff --git a/builtin-rm.c b/builtin-rm.c
index 9014c61556c80d2d37d7f59e9e9419d3b3ba9884..92d205a7153a7cc5267ea9cf774bc1e4fac887d4 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -6,6 +6,7 @@
 #include "cache.h"
 #include "builtin.h"
 #include "dir.h"
+#include "cache-tree.h"
 
 static const char builtin_rm_usage[] =
 "git-rm [-n] [-v] [-f] <filepattern>...";
@@ -40,19 +41,18 @@ static int remove_file(const char *name)
        return ret;
 }
 
-static struct cache_file cache_file;
+static struct lock_file lock_file;
 
-int cmd_rm(int argc, const char **argv, char **envp)
+int cmd_rm(int argc, const char **argv, const char *prefix)
 {
        int i, newfd;
        int verbose = 0, show_only = 0, force = 0;
-       const char *prefix = setup_git_directory();
        const char **pathspec;
        char *seen;
 
        git_config(git_default_config);
 
-       newfd = hold_index_file_for_update(&cache_file, get_index_file());
+       newfd = hold_lock_file_for_update(&lock_file, get_index_file());
        if (newfd < 0)
                die("unable to create new index file");
 
@@ -82,15 +82,14 @@ int cmd_rm(int argc, const char **argv, char **envp)
                }
                die(builtin_rm_usage);
        }
-       pathspec = get_pathspec(prefix, argv + i);
+       if (argc <= i)
+               usage(builtin_rm_usage);
 
+       pathspec = get_pathspec(prefix, argv + i);
        seen = NULL;
-       if (pathspec) {
-               for (i = 0; pathspec[i] ; i++)
-                       /* nothing */;
-               seen = xmalloc(i);
-               memset(seen, 0, i);
-       }
+       for (i = 0; pathspec[i] ; i++)
+               /* nothing */;
+       seen = xcalloc(i, 1);
 
        for (i = 0; i < active_nr; i++) {
                struct cache_entry *ce = active_cache[i];
@@ -117,14 +116,18 @@ int cmd_rm(int argc, const char **argv, char **envp)
 
                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)
+               return 0;
+
        /*
         * Then, if we used "-f", remove the filenames from the
         * workspace. If we fail to remove the first one, we
         * abort the "git rm" (but once we've successfully removed
         * any file at all, we'll go ahead and commit to it all:
-        * by then we've already committed ourself and can't fail
+        * by then we've already committed ourselves and can't fail
         * in the middle)
         */
        if (force) {
@@ -142,7 +145,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
 
        if (active_cache_changed) {
                if (write_cache(newfd, active_cache, active_nr) ||
-                   commit_index_file(&cache_file))
+                   close(newfd) || commit_lock_file(&lock_file))
                        die("Unable to write new index file");
        }