Skip to content

Commit 55e8fad

Browse files
committed
Merge branch 'rs/pretty-format-double-negation-fix'
Code clarification. * rs/pretty-format-double-negation-fix: pretty: avoid double negative in format_commit_item()
2 parents 377d1ca + 1dd14e8 commit 55e8fad

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pretty.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1855,10 +1855,10 @@ static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
18551855
}
18561856

18571857
orig_len = sb->len;
1858-
if ((context)->flush_type != no_flush)
1859-
consumed = format_and_pad_commit(sb, placeholder, context);
1860-
else
1858+
if (context->flush_type == no_flush)
18611859
consumed = format_commit_one(sb, placeholder, context);
1860+
else
1861+
consumed = format_and_pad_commit(sb, placeholder, context);
18621862
if (magic == NO_MAGIC)
18631863
return consumed;
18641864

0 commit comments

Comments
 (0)