conflict_rename_delete(): Check whether D/F conflicts are still present

diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 34480cfad6a8842d65ae61f6257c597a2a987b33..97eed4012ba23cfe7f13cf2b6c160ade54f6b2d1 100644 (file)
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -32,7 +32,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 {
        int i;
        const char *dest = NULL;
-       int nongit;
        unsigned flags = 0;
        int quiet = 0;
        const char *uploadpack = NULL;
@@ -42,8 +41,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
        struct transport *transport;
        const struct ref *ref;
 
-       setup_git_directory_gently(&nongit);
-
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];