From: Mirko Faina <mroik@delayed.space>
To: Ben Knoble <ben.knoble@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"Patrick Steinhardt" <ps@pks.im>,
"Jean-Noël Avila" <jn.avila@free.fr>, "Jeff King" <peff@peff.net>,
"Mirko Faina" <mroik@delayed.space>
Subject: Re: [PATCH] revision.c: implement --reverse=before for walks
Date: Sun, 19 Apr 2026 20:11:13 +0200 [thread overview]
Message-ID: <aeUZUqSQI8FvRUco@exploit> (raw)
In-Reply-To: <C60EE993-97DA-45F7-89DE-2F97ABB0F685@gmail.com>
On Sun, Apr 19, 2026 at 08:06:24AM -0400, Ben Knoble wrote:
> > -`--reverse`::
> > +`--reverse[=(after|before)]`::
> > Output the commits chosen to be shown (see 'Commit Limiting'
> > section above) in reverse order. Cannot be combined with
> > - `--walk-reflogs`.
> > + `--walk-reflogs`. `when` can either be `after` or `before`, if
>
> “When” is not mentioned prior to here, so it’s explanation leaves the reader wondering what it refers to.
Yes, when I first wrote it it said `--reverse[=when]` but forgot to
change the text after deciding to give the valid inputs instead. Will
fix in v2.
> The original handles multiple reverse options inverting each other…
>
> > + } else if (starts_with(arg, "--reverse")) {
> > + if (!skip_prefix(arg, "--reverse=", &optarg)) {
> > + if (argc < 2) {
> > + revs->reverse = 1;
> > + return 1;
> > + } else {
> > + optarg = argv[1];
> > + }
> > + }
> > +
> > + if (!strcmp(optarg, "after")) {
> > + revs->reverse = 1;
> > + } else if (!strcmp(optarg, "before")) {
> > + revs->reverse = 2;
> > + } else {
> > + revs->reverse = 1;
> > + return 1;
> > + }
> > +
> > + return optarg == argv[1] ? 2 : 1;
>
> …which I don’t see here.
>
> I’m not familiar with this parsing code though so I can’t add much about the test other than to say it is a bit hard to follow :/
Given that it is no longer binary handling multiple reverse can't simply
be inverting bits, it wouldn't make sense. This is done before the walk
itself, so even from the POV of the user it wouldn't make much sense to
reverse multiple times as the order of the applied options before this
patch (commit limiting options then reverse) doesn't change.
This doesn't break any tests so I assumed it was fine.
> > } else if (!strcmp(arg, "--children")) {
> > revs->children.name = "children";
> > revs->limited = 1;
> > @@ -4525,19 +4543,35 @@ struct commit *get_revision(struct rev_info *revs)
> > {
> > struct commit *c;
> > struct commit_list *reversed;
> > + int max_count = revs->max_count;
> > +
> > + if (revs->reverse && !revs->reverse_output_stage) {
> > + if (revs->reverse == 3) {
> > + BUG("allowed values for reverse are 0, 1 and 2");
> > + revs->reverse = 1;
> > + }
>
> Is this possible? I guess I can see from the expanded bit width that it’s a valid input, and there’s no protection stopping other callers accidentally adding this.
Current code should never generate a 3, but in case it happens I assume
the user wants to use the original behaviour of reverse, so I set the
value accordingly instead of stopping the program and notify that
there's a bug.
Should this be changed?
> I haven’t looked, but it would be nice if we could use an enum instead. Unfortunately that would probably take up more space in the struct, and I suppose the bit-packing is done intentionally for performance.
Could define new macros so that the readers don't have to mentally keep
track of which value rapresents what. I didn't think that was
necessary, should I change it?
> >
> > if (revs->reverse_output_stage) {
> > + if (revs->reverse == 2 && revs->max_count == 0)
> > + return NULL;
> > +
> > c = pop_commit(&revs->commits);
> > + if (revs->reverse == 2)
> > + revs->max_count--;
>
> Hm. Why do we decrement here? Again, not an area I’m familiar with, but a bit surprising.
get_revision() (in revision.c) handles the reverse option and updates
the "struct git_graph". get_revision() then calls
get_revision_internal(), which handles commit boundaries and max_count,
here is where it gets decreased. Since max_count gets decreased
everytime get_revision_internal() is called, if we were to leave
max_count as is before the walk (in get_revision() at line 4558), the
walk would stop before reaching the root commit. This is why the current
--reverse option is applied only after commit limiting options. So
instead we set max_count at -1 walking the whole history and storing it
in 'reversed'. Now we're in "reverse_output_stage = 1", and in this
state we never call get_revision_internal() again, instead we pop
commits from 'reversed'. Because of this we have to handle max_count
outside get_revision_internal(), so we decrement it in the snippet of
code you referenced.
A bit verbose but hopefully it'll get my point across.
Thank you
next prev parent reply other threads:[~2026-04-19 18:11 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-18 16:47 [PATCH] revision.c: implement --reverse=before for walks Mirko Faina
2026-04-18 18:20 ` Tian Yuchen
2026-04-18 18:42 ` Mirko Faina
2026-04-18 18:51 ` Mirko Faina
2026-04-20 16:06 ` Junio C Hamano
2026-04-20 17:08 ` Tian Yuchen
2026-04-20 23:50 ` Mirko Faina
2026-04-19 12:06 ` Ben Knoble
2026-04-19 18:11 ` Mirko Faina [this message]
2026-04-19 19:12 ` D. Ben Knoble
2026-04-19 20:31 ` Mirko Faina
2026-04-20 0:21 ` Jeff King
2026-04-20 9:33 ` Mirko Faina
2026-04-20 10:30 ` Mirko Faina
2026-04-21 3:48 ` Jeff King
2026-04-22 18:24 ` D. Ben Knoble
2026-04-22 19:42 ` Mirko Faina
2026-04-20 0:04 ` Jeff King
2026-04-20 9:22 ` Mirko Faina
2026-04-22 0:28 ` [PATCH v2 0/2] " Mirko Faina
2026-04-22 0:30 ` Mirko Faina
2026-04-23 22:51 ` [PATCH v3 " Mirko Faina
2026-04-23 22:51 ` [PATCH v3 1/2] " Mirko Faina
2026-04-28 1:45 ` Junio C Hamano
2026-04-23 22:52 ` [PATCH v3 2/2] revision.c: reduce memory usage on reverse before Mirko Faina
2026-04-27 0:24 ` [PATCH v4 0/2] revision.c: implement --reverse=before for walks Mirko Faina
2026-04-27 0:24 ` [PATCH v4 1/2] " Mirko Faina
2026-04-27 6:45 ` Junio C Hamano
2026-04-27 7:33 ` Johannes Sixt
2026-04-27 12:30 ` Junio C Hamano
2026-04-27 13:58 ` Chris Torek
2026-04-27 16:48 ` [PATCH v4 1/2] revision.c: implement -b-reverse=before " Mirko Faina
2026-04-28 1:46 ` Junio C Hamano
2026-04-28 1:45 ` [PATCH v4 1/2] revision.c: implement --reverse=before " Junio C Hamano
2026-04-27 0:24 ` [PATCH v4 2/2] revision.c: reduce memory usage on reverse before Mirko Faina
2026-04-28 1:46 ` Junio C Hamano
2026-04-30 19:52 ` [PATCH v5] revision.c: implement --max-count-oldest Mirko Faina
2026-05-04 5:19 ` Junio C Hamano
2026-05-04 13:08 ` Mirko Faina
2026-05-05 21:54 ` [PATCH v6] " Mirko Faina
2026-05-06 6:45 ` Johannes Sixt
2026-05-06 12:54 ` Mirko Faina
2026-05-07 9:20 ` Junio C Hamano
2026-05-08 0:09 ` Mirko Faina
2026-05-09 12:46 ` Jean-Noël AVILA
2026-05-10 0:41 ` Mirko Faina
2026-05-09 21:01 ` Junio C Hamano
2026-05-10 0:48 ` Mirko Faina
2026-05-09 11:01 ` [PATCH v5] " Junio C Hamano
2026-05-10 0:36 ` Mirko Faina
2026-04-22 0:28 ` [PATCH v2 1/2] revision.c: implement --reverse=before for walks Mirko Faina
2026-04-22 22:44 ` Jeff King
2026-04-22 22:53 ` Mirko Faina
2026-04-22 0:28 ` [PATCH v2 2/2] revision.c: reduce memory usage on reverse before Mirko Faina
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aeUZUqSQI8FvRUco@exploit \
--to=mroik@delayed.space \
--cc=ben.knoble@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jn.avila@free.fr \
--cc=peff@peff.net \
--cc=ps@pks.im \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.