Re: What's cooking in git.git (Apr 2017, #04; Wed, 19)

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 20, 2017, 22:46 UTC
Message-ID: <xmqqshl28zpi.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170420095921.GA23873@ash>

Duy Nguyen <pclouds@gmail.com> writes:

> Looking good. I would add some comment, lest ';' feel lonely. But it's
> really personal taste.

... which matches mine.   Thanks for the update (which I'll squash in).

Show 16 quoted lines

>
> -- 8< --
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> index 5ebdcce793..bc75676bf3 100644
> --- a/builtin/worktree.c
> +++ b/builtin/worktree.c
> @@ -310,7 +310,7 @@ static int add_worktree(const char *path, const char *refname,
>  	strbuf_reset(&sb);
>  	strbuf_addf(&sb, "%s/locked", sb_repo.buf);
>  	if (!ret && opts->keep_locked)
> -		;
> +		;	      /* --lock wants to keep "locked" file */
>  	else
>  		unlink_or_warn(sb.buf);
>  	argv_array_clear(&child_env);
> -- 8< --