From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: git@vger.kernel.org, paulus@ozlabs.org
Subject: Re: [PATCH 2/3] log: add a config option for --graph
Date: Wed, 09 Feb 2022 10:25:52 -0800 [thread overview]
Message-ID: <xmqq4k5799sf.fsf@gitster.g> (raw)
In-Reply-To: <20220209162350.169971-2-alexhenrie24@gmail.com> (Alex Henrie's message of "Wed, 9 Feb 2022 09:23:48 -0700")
Alex Henrie <alexhenrie24@gmail.com> writes:
> + if (default_graph &&
> + !rev->graph &&
This part I can see why we want to check ;-)
> + !rev->track_linear &&
> + !rev->reverse &&
> + !rev->reflog_info &&
> + !rev->no_walk) {
But this makes me wonder how we plan to keep this list of "if the
user asked for any of these options, we shouldn't turn graph on by
default" up-to-date. The scheme looks brittle.
Also, what would happen when a developer wants to add, say
log.reverse, configuration variable in the future? I can see the
block to do the equivalent of this for .log.reverse begins with
if (default_reverse &&
!rev->reverse &&
but I am not sure what other conditions need to be checked,
especially with 'graph'---should it check for !rev->graph or
default_graph of both? Are we playing with a potential
combinatorial explosion?
> + rev->topo_order = 1;
> + rev->rewrite_parents = 1;
> + rev->graph = graph_init(rev);
In any case, it probably makes sense to encapsulate these three
lines in a small helper function "when --graph is asked for on a
rev, call this function" in the PREVIOUS step of the series, and
change this patch to read more like
if (default_graph &&
/* check for incompatible options */
!rev->track_linear && !rev->reverse && ...)
rev_add_graph_option(rev);
Most importantly, the helper should be one that handles "wow, we see
that rev->graph is already populated, what should we do?", and not
this caller. And that helper can be called unconditionally by the
command line parser when it finds !strcmp(arg, "--graph") yields
true.
Thanks.
next prev parent reply other threads:[~2022-02-09 18:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-09 16:23 [PATCH 1/3] log: fix memory leak if --graph is passed multiple times Alex Henrie
2022-02-09 16:23 ` [PATCH 2/3] log: add a config option for --graph Alex Henrie
2022-02-09 18:25 ` Junio C Hamano [this message]
2022-02-10 16:49 ` Alex Henrie
2022-02-09 16:23 ` [PATCH 3/3] gitk: set log.graph=false when running `git log` Alex Henrie
2022-02-09 18:26 ` Junio C Hamano
2022-02-10 16:50 ` Alex Henrie
2022-02-10 20:15 ` Junio C Hamano
2022-02-09 18:16 ` [PATCH 1/3] log: fix memory leak if --graph is passed multiple times Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4k5799sf.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=paulus@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).