From: Christian Couder Date: Sun, 03 Mar 2019 09:41:49 GMT Subject: Re: [PATCH RFC 06/20] cat-file: remove mark_query from expand_data Message-ID: In-Reply-To: <0102016915f49a4f-f02a6509-a3ba-41b0-b768-3d8ba116f526-000000@eu-west-1.amazonses.com> On Fri, Feb 22, 2019 at 5:07 PM Olga Telezhnaya wrote: > > Get rid of mark_query field in struct expand_data. > expand_data may be global further as we use it in ref-filter also, > so we need to remove cat-file specific fields from it. > > All globals that I add through this patch will be deleted in the end, > so treat it just as the middle step. > > Signed-off-by: Olga Telezhnaia > --- > builtin/cat-file.c | 22 +++++++++------------- > 1 file changed, 9 insertions(+), 13 deletions(-) > > diff --git a/builtin/cat-file.c b/builtin/cat-file.c > index 60f3839b06f8c..9bcb02fad1f0d 100644 > --- a/builtin/cat-file.c > +++ b/builtin/cat-file.c > @@ -29,6 +29,8 @@ struct batch_options { > }; > > static const char *force_path; > +/* Will be deleted at the end of this patch */ When this patch is committed, there is no patch anymore, only a commit. And of course the variable will be deleted in a following commit. So instead I'd rather see something like: /* Will be deleted in a following commit */ or maybe: /* TODO: delete this in a following commit */