On Tue, Jan 8, 2019 at 2:21 PM Junio C Hamano <[email protected]> wrote: > > [email protected] writes: > > > From: Issac Trotts <[email protected]> > > Heh, I'll edit this line to match S-o-b: below.
Thanks. Otherwise I have to set up git send-email again on my work laptop. > > Make it possible to write for example > > > > git log --format="%H,%S" > > > > where the %S at the end is a new placeholder that prints out the ref > > (tag/branch) for each commit. > > > > Using %d might seem like an alternative but it only shows the ref for the > > last > > commit in the branch. > > > > Signed-off-by: Issac Trotts <[email protected]> > > > > --- > > > > > diff --git a/log-tree.c b/log-tree.c > > index 10680c139..3cb14256e 100644 > > --- a/log-tree.c > > +++ b/log-tree.c > > @@ -700,6 +700,7 @@ void show_log(struct rev_info *opt) > > ctx.color = opt->diffopt.use_color; > > ctx.expand_tabs_in_log = opt->expand_tabs_in_log; > > ctx.output_encoding = get_log_output_encoding(); > > + ctx.rev = opt; > > There are quite a few existing codepaths that change their behaviour > based on NULL-ness of ctx.rev field. How would we make sure that > this change have no unintended consequence, I wonder? > > > + case 'S': /* tag/branch like --source */ > > + if (c->pretty_ctx->rev == NULL || c->pretty_ctx->rev->sources > > == NULL) { > > + return 0; > > + } > > + slot = revision_sources_at(c->pretty_ctx->rev->sources, > > commit); > > + if (!(slot && *slot)) { > > + return 0; > > + } > > + strbuf_addstr(sb, *slot); > > + return 1; > > Let's update the style of this hunk here like so: > > if (!c->pretty_ctx->rev || !c->pretty_ctx->rev->sources) > return 0; > slot = ...; > if (!(slot && *slot)) > return 0; > strbuf_addstr(...); > return 1; Done. > > I wonder if it is even better to apply de-Morgan to one of the above > two, i.e. > > if (!(c->pretty_ctx->rev && c->pretty_ctx->rev->sources)) > return 0; > Done. > > Anyway, thanks. Will queue. > Sounds good. Btw, did you queue it yet? I didn't see it at the mirror: https://github.com/git/git/commits/master. I'll send out another patch with your suggestions, in case you haven't already queued it. Issac
