Merge branch 'js/read-tree' into js/c-merge-recursive

[git.git] / builtin-rm.c

diff --git a/builtin-rm.c b/builtin-rm.c
index ef2f8b5d099555c259a39985d8e765cf378e4431..92d205a7153a7cc5267ea9cf774bc1e4fac887d4 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -43,11 +43,10 @@ static int remove_file(const char *name)
 
 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;
 
@@ -83,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];
@@ -121,12 +119,15 @@ int cmd_rm(int argc, const char **argv, char **envp)
                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) {
@@ -144,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_lock_file(&lock_file))
+                   close(newfd) || commit_lock_file(&lock_file))
                        die("Unable to write new index file");
        }