public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
* [PATCH] pretty: avoid double negative in format_commit_item()
@ 2023-07-07 18:46 René Scharfe
  2023-07-07 19:06 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: René Scharfe @ 2023-07-07 18:46 UTC (permalink / raw)
  To: Git List

Test for equality with no_flush, which has enough negation already.  Get
rid of the unnecessary parentheses while at it.

Signed-off-by: René Scharfe <l.s.r@web•de>
---
 pretty.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pretty.c b/pretty.c
index 7862be105d..81cdc9f2cd 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1855,10 +1855,10 @@ static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
 	}

 	orig_len = sb->len;
-	if ((context)->flush_type != no_flush)
-		consumed = format_and_pad_commit(sb, placeholder, context);
-	else
+	if (context->flush_type == no_flush)
 		consumed = format_commit_one(sb, placeholder, context);
+	else
+		consumed = format_and_pad_commit(sb, placeholder, context);
 	if (magic == NO_MAGIC)
 		return consumed;

--
2.41.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] pretty: avoid double negative in format_commit_item()
  2023-07-07 18:46 [PATCH] pretty: avoid double negative in format_commit_item() René Scharfe
@ 2023-07-07 19:06 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2023-07-07 19:06 UTC (permalink / raw)
  To: René Scharfe; +Cc: Git List

René Scharfe <l.s.r@web•de> writes:

> Test for equality with no_flush, which has enough negation already.  Get
> rid of the unnecessary parentheses while at it.

Makes sense.  This double negation was with us since a5752342
(pretty: support padding placeholders, %< %> and %><, 2013-04-19),
that is more than 10 years old ;-)

Will queue.

Thanks.

> Signed-off-by: René Scharfe <l.s.r@web•de>
> ---
>  pretty.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/pretty.c b/pretty.c
> index 7862be105d..81cdc9f2cd 100644
> --- a/pretty.c
> +++ b/pretty.c
> @@ -1855,10 +1855,10 @@ static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
>  	}
>
>  	orig_len = sb->len;
> -	if ((context)->flush_type != no_flush)
> -		consumed = format_and_pad_commit(sb, placeholder, context);
> -	else
> +	if (context->flush_type == no_flush)
>  		consumed = format_commit_one(sb, placeholder, context);
> +	else
> +		consumed = format_and_pad_commit(sb, placeholder, context);
>  	if (magic == NO_MAGIC)
>  		return consumed;
>
> --
> 2.41.0

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-07-07 19:06 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-07 18:46 [PATCH] pretty: avoid double negative in format_commit_item() René Scharfe
2023-07-07 19:06 ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox