From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 04A031F404 for ; Thu, 15 Feb 2018 05:56:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754770AbeBOF4W (ORCPT ); Thu, 15 Feb 2018 00:56:22 -0500 Received: from cloud.peff.net ([104.130.231.41]:53442 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1754746AbeBOF4V (ORCPT ); Thu, 15 Feb 2018 00:56:21 -0500 Received: (qmail 2772 invoked by uid 109); 15 Feb 2018 05:56:21 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with SMTP; Thu, 15 Feb 2018 05:56:21 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 7429 invoked by uid 111); 15 Feb 2018 05:57:06 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.94) with (ECDHE-RSA-AES256-GCM-SHA384 encrypted) SMTP; Thu, 15 Feb 2018 00:57:06 -0500 Authentication-Results: peff.net; auth=none Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Thu, 15 Feb 2018 00:56:19 -0500 Date: Thu, 15 Feb 2018 00:56:19 -0500 From: Jeff King To: Olga Telezhnaya Cc: git@vger.kernel.org Subject: Re: [PATCH v3 20/23] ref-filter: unifying formatting of cat-file opts Message-ID: <20180215055618.GP18780@sigill.intra.peff.net> References: <01020161890f4236-47989eb4-c19f-4282-9084-9d4f90c2ebeb-000000@eu-west-1.amazonses.com> <01020161890f437a-302b1577-f034-4a24-a3a2-851d1cda0044-000000@eu-west-1.amazonses.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <01020161890f437a-302b1577-f034-4a24-a3a2-851d1cda0044-000000@eu-west-1.amazonses.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Mon, Feb 12, 2018 at 08:08:54AM +0000, Olga Telezhnaya wrote: > cat-file options are now filled by general logic. Yay. One puzzling thing: > diff --git a/ref-filter.c b/ref-filter.c > index 8d104b567eb7c..5781416cf9126 100644 > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -824,8 +824,12 @@ static void grab_common_values(struct atom_value *val, int deref, struct object > else if (!strcmp(name, "objectsize")) { > v->value = sz; > v->s = xstrfmt("%lu", sz); > - } > - else if (deref) > + } else if (!strcmp(name, "objectsize:disk")) { > + if (cat_file_info.is_cat_file) { > + v->value = cat_file_info.disk_size; > + v->s = xstrfmt("%"PRIuMAX, (uintmax_t)v->value); > + } > + } else if (deref) Why do we care about is_cat_file here. Shouldn't: git for-each-ref --format='%(objectsize:disk)' work? I.e., shouldn't the cat_file_info.disk_size variable be held somewhere in a used_atom struct? -Peff