daemon: new option --detach to run git-daemon in background

diff --git a/builtin-rm.c b/builtin-rm.c
index 4d56a1f07065e6e8ebaa95fdfe843cffb6283af3..5deb81171996029b31da14109c408ffba33f7957 100644 (file)
--- a/builtin-rm.c
+++ b/builtin-rm.c
@@ -129,7 +129,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) {
@@ -147,7 +147,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");
        }