scalar: make enlistment delete to work on all POSIX platforms

The ability to remove the current working directory is not guaranteed by
POSIX so it is better to go out of the directory we want to delete on
all platforms unconditionally.

Signed-off-by: Marcel Telka <marcel@telka.sk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/scalar.c b/scalar.c
index 7234049a1b87c046d26db57082e368b9ba68812f..331b91dbdb37aed7acbf45c631fb9fdb5df1b3a5 100644 (file)
--- a/scalar.c
+++ b/scalar.c
@@ -361,16 +361,13 @@ static char *remote_default_branch(const char *url)
 
 static int delete_enlistment(struct strbuf *enlistment)
 {
-#ifdef WIN32
        struct strbuf parent = STRBUF_INIT;
        size_t offset;
        char *path_sep;
-#endif
 
        if (unregister_dir())
                return error(_("failed to unregister repository"));
 
-#ifdef WIN32
        /*
         * Change the current directory to one outside of the enlistment so
         * that we may delete everything underneath it.
@@ -385,7 +382,6 @@ static int delete_enlistment(struct strbuf *enlistment)
                return res;
        }
        strbuf_release(&parent);
-#endif
 
        if (have_fsmonitor_support() && stop_fsmonitor_daemon())
                return error(_("failed to stop the FSMonitor daemon"));