aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-06-06 12:49:25 -0700
committerJunio C Hamano <gitster@pobox.com>2024-06-06 12:49:25 -0700
commit9d8e7d2ef7b256f79975c7d21b6e50491df89bb9 (patch)
tree668528a187dbcaa2be5c558ff3e44091a6cc0ecd
parentdf5c2c4962819e0baf9982e41905e0e3bc8ed9e8 (diff)
parent72b8c934f236711921014c26c9dc64c1611cff82 (diff)
downloadgit-9d8e7d2ef7b256f79975c7d21b6e50491df89bb9.tar.gz
Merge branch 'mt/openindiana-scalar'
Avoid removing the $(cwd) for portability. * mt/openindiana-scalar: scalar: make enlistment delete to work on all POSIX platforms
-rw-r--r--scalar.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/scalar.c b/scalar.c
index 7234049a1b..331b91dbdb 100644
--- 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"));