Hi Eric,
On Thu, 3 May 2018, Eric Sunshine wrote:
> On Thu, May 3, 2018 at 11:30 AM, Johannes Schindelin
> <johannes.schinde...@gmx.de> wrote:
> > Just like tbdiff, we now show the diff between matching patches. This is
> > a "diff of two diffs", so it can be a bit daunting to read for the
> > beginnger.
>
> s/beginnger/beginner/
>
> > This brings branch-diff closer to be feature-complete with regard to
>
> s/be feature-complete/feature parity/
Yes.
> > diff --git a/builtin/branch-diff.c b/builtin/branch-diff.c
> > @@ -319,24 +348,37 @@ static void output(struct string_list *a, struct
> > string_list *b)
> > int cmd_branch_diff(int argc, const char **argv, const char *prefix)
> > {
> > - int no_patches = 0;
> > + struct diff_options diffopt = { 0 };
> > double creation_weight = 0.6;
> > struct option options[] = {
> > - OPT_BOOL(0, "no-patches", &no_patches,
> > - N_("short format (no diffs)")),
>
> This was added in 2/18 but never used...
>
> > + OPT_SET_INT(0, "no-patches", &diffopt.output_format,
> > + N_("short format (no diffs)"),
> > + DIFF_FORMAT_NO_OUTPUT),
>
> ... and is then replaced in its entirety by this. Perhaps just drop
> the original --no-patches from 2/18 and let it be introduced for the
> first time here?
Sure. I actually started out by parsing even the --color option, but had
stripped that out in a rebase -i run, in favor of using diff_parse_opt()
later. I should really do the same here, too.
Thanks,
Dscho
