| Message ID | 20210613045949.255090-4-felipe.contreras@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pull: obvious fixes | expand |
On Sat, Jun 12, 2021 at 9:59 PM Felipe Contreras <felipe.contreras@gmail.com> wrote: > > Two spaces unaligned to anything is not part of the coding-style. A > single tab is. > > Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> > --- > builtin/pull.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/builtin/pull.c b/builtin/pull.c > index 80e2f55cbc..3e13f81084 100644 > --- a/builtin/pull.c > +++ b/builtin/pull.c > @@ -126,9 +126,9 @@ static struct option pull_options[] = { > /* Options passed to git-merge or git-rebase */ > OPT_GROUP(N_("Options related to merging")), > OPT_CALLBACK_F('r', "rebase", &opt_rebase, > - "(false|true|merges|preserve|interactive)", > - N_("incorporate changes by rebasing rather than merging"), > - PARSE_OPT_OPTARG, parse_opt_rebase), > + "(false|true|merges|preserve|interactive)", > + N_("incorporate changes by rebasing rather than merging"), > + PARSE_OPT_OPTARG, parse_opt_rebase), > OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL, > N_("do not show a diffstat at the end of the merge"), > PARSE_OPT_NOARG | PARSE_OPT_NONEG), > -- > 2.32.0 Not only does this change bring this code in alignment with the coding style, it also makes it more consistent with the other code around it. None of the other options parsing in this file used a tab-and-two-space indent, so it's curious why this one was added this way. Anyway, thanks for fixing.
diff --git a/builtin/pull.c b/builtin/pull.c index 80e2f55cbc..3e13f81084 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -126,9 +126,9 @@ static struct option pull_options[] = { /* Options passed to git-merge or git-rebase */ OPT_GROUP(N_("Options related to merging")), OPT_CALLBACK_F('r', "rebase", &opt_rebase, - "(false|true|merges|preserve|interactive)", - N_("incorporate changes by rebasing rather than merging"), - PARSE_OPT_OPTARG, parse_opt_rebase), + "(false|true|merges|preserve|interactive)", + N_("incorporate changes by rebasing rather than merging"), + PARSE_OPT_OPTARG, parse_opt_rebase), OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL, N_("do not show a diffstat at the end of the merge"), PARSE_OPT_NOARG | PARSE_OPT_NONEG),
Two spaces unaligned to anything is not part of the coding-style. A single tab is. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- builtin/pull.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)