git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] scalar: make enlistment delete to work on all POSIX platforms

From
Josh Steadmon <steadmon@google.com>
Date
May 30, 2024, 20:57 UTC
Message-ID
<v6q5pahyzcoa7c6tp2x63awvtc6xvjjpi4kl5okgk5qi4god7f@yg55zwwmcuzt>
In-Reply-To
<Zkds81OB7C5bTCl_@telcontar>
On 2024.05.17 16:42, Marcel Telka wrote:
Show 39 quoted lines
> 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>
> ---
>  scalar.c | 4 ----
>  1 file changed, 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"));
> 

This looks like a straightforward change; none of the formerly protected logic uses anything specific to Windows, and tests still pass on Linux, so this looks good to me.

Reviewed-by: Josh Steadmon <steadmon@google.com>
Previous: Johannes SchindelinNext: Junio C Hamano
Message 4 of 5 in “scalar: make enlistment delete to work on all POSIX platforms”
  1. scalar: make enlistment delete to work on all POSIX platformsMarcel Telka, May 17, 2024
  2. Junio C HamanoMay 17, 2024
  3. Johannes SchindelinMay 18, 2024
  4. Josh SteadmonMay 30, 2024
  5. Junio C HamanoMay 30, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.