Re: [PATCH] branch: do not fail a no-op --edit-desc

["Rubén Justo" <rjusto@gmail.com>]

On 28/9/22 21:15, Junio C Hamano wrote:
> In a repository on a branch without branch description, try running

On a branch without description, ..

> The simpler solution of course introduces TOCTOU, but you are

Nice to introduce a term that can generate curiosity.

> fooling yourself in your own repository.  Not overwriting the branch
> description on the same branch you added in another window, while
> you had this other editor open, may even be a feature ;-)

Not overwriting if there was no description in the first place, otherwise
will clear.. ¿?

> 
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  builtin/branch.c  | 6 ++++--
>  t/t3200-branch.sh | 3 +++
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git c/builtin/branch.c w/builtin/branch.c
> index 5d00d0b8d3..dcd847158a 100644
> --- c/builtin/branch.c
> +++ w/builtin/branch.c
> @@ -604,10 +604,11 @@ static GIT_PATH_FUNC(edit_description, "EDIT_DESCRIPTION")
>  
>  static int edit_branch_description(const char *branch_name)
>  {
> +	int exists;
>  	struct strbuf buf = STRBUF_INIT;
>  	struct strbuf name = STRBUF_INIT;
>  
> -	read_branch_desc(&buf, branch_name);
> +	exists = !read_branch_desc(&buf, branch_name);
>  	if (!buf.len || buf.buf[buf.len-1] != '\n')
>  		strbuf_addch(&buf, '\n');
>  	strbuf_commented_addf(&buf,
> @@ -624,7 +625,8 @@ static int edit_branch_description(const char *branch_name)
>  	strbuf_stripspace(&buf, 1);
>  
>  	strbuf_addf(&name, "branch.%s.description", branch_name);
> -	git_config_set(name.buf, buf.len ? buf.buf : NULL);
> +	if (buf.len || exists)
> +		git_config_set(name.buf, buf.len ? buf.buf : NULL);
>  	strbuf_release(&name);
>  	strbuf_release(&buf);
>  
> diff --git c/t/t3200-branch.sh w/t/t3200-branch.sh
> index 9723c2827c..5f72fd7453 100755
> --- c/t/t3200-branch.sh
> +++ w/t/t3200-branch.sh
> @@ -1381,6 +1381,9 @@ test_expect_success 'branch --delete --force removes dangling branch' '
>  '
>  
>  test_expect_success 'use --edit-description' '
> +	EDITOR=: git branch --edit-description &&
> +	test_must_fail git config branch.main.description &&
> +
>  	write_script editor <<-\EOF &&
>  		echo "New contents" >"$1"
>  	EOF
> 

The change looks fine and removes a confusing error. Good.

Thanks.