Thread (104 messages) 104 messages, 4 authors, 2018-02-19

Re: [PATCH v3 20/23] ref-filter: unifying formatting of cat-file opts

From: Оля Тележная <hidden>
Date: 2018-02-15 10:34:54

2018-02-15 8:56 GMT+03:00 Jeff King [off-list ref]:
On Mon, Feb 12, 2018 at 08:08:54AM +0000, Olga Telezhnaya wrote:
quoted
cat-file options are now filled by general logic.
Yay.

One puzzling thing:
quoted
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?
At that point - no.
I think it sounds like other separate task to add this functionality
and to test it properly.
-Peff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help