On Thu, Dec 03, 2020 at 10:22:35AM -0800, Junio C Hamano wrote: > Jeff King <peff@xxxxxxxx> writes: > > > Commit 6dc905d974 (config: split repo scope to local and worktree, > > 2020-02-10) made some "if" statements multiline, but didn't indent the > > second lines in our usual way. > > > > Signed-off-by: Jeff King <peff@xxxxxxxx> > > --- > > I just happened to be reading nearby code and saw this. > > Can we rephrase "by 4 spaces" to avoid misleading new developers, > though? It's not like our rule is to indent continued expression by > 4 spaces---it happens to be 4 in this case only because the second > line is aligned with the column inside "if (". > > If the expression were > > if ((A == X && B == Y && > boolean_expression_on_the_second_line()) || > C == Z) > > we would have indented the second line to align with the inside of > the opening parenthesis, which may end up with "by 5 spaces", but > four vs five is not the important part of the equation. Yeah, the goal is to align it, but I had trouble thinking of a succinct way to say that. Maybe just: style: align indent of multiline "if" conditions ? -Peff