Makefile: ssh-pull.o depends on ssh-fetch.c

diff --git a/builtin-rm.c b/builtin-rm.c
index 875d8252fa72cf7adc1d6bb254ebc3a5995e49dd..bb810ba41ae23c9dc4c38fbb0fa7883a33d43524 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -90,8 +90,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
        seen = NULL;
        for (i = 0; pathspec[i] ; i++)
                /* nothing */;
-       seen = xmalloc(i);
-       memset(seen, 0, i);
+       seen = xcalloc(i, 1);
 
        for (i = 0; i < active_nr; i++) {
                struct cache_entry *ce = active_cache[i];
@@ -129,7 +128,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
         * 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) {