diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-09-14 18:16:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-14 18:16:59 (GMT) |
| commit | 6a4e7440fb4b20822e1854925c0dcfae0c64402d (patch) | |
| tree | 5b4aa38a74edc458a61b91d3fbee4a14611f3dfc /ref-filter.c | |
| parent | d4cab3717f1afb6d0f423fa7b1cd87b657c507e3 (diff) | |
| parent | 6d79cd8474b7bb4979f2a7544fd736bed190261a (diff) | |
| download | git-6a4e7440fb4b20822e1854925c0dcfae0c64402d.zip git-6a4e7440fb4b20822e1854925c0dcfae0c64402d.tar.gz git-6a4e7440fb4b20822e1854925c0dcfae0c64402d.tar.bz2 | |
Merge branch 'ks/ref-filter-sort-numerically'
"git for-each-ref --sort='contents:size'" sorts the refs according
to size numerically, giving a ref that points at a blob twelve-byte
(12) long before showing a blob hundred-byte (100) long.
* ks/ref-filter-sort-numerically:
ref-filter: sort numerically when ":size" is used
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/ref-filter.c b/ref-filter.c index 88b021d..fae9f4b 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -583,9 +583,10 @@ static int contents_atom_parser(struct ref_format *format, struct used_atom *ato atom->u.contents.option = C_BARE; else if (!strcmp(arg, "body")) atom->u.contents.option = C_BODY; - else if (!strcmp(arg, "size")) + else if (!strcmp(arg, "size")) { + atom->type = FIELD_ULONG; atom->u.contents.option = C_LENGTH; - else if (!strcmp(arg, "signature")) + } else if (!strcmp(arg, "signature")) atom->u.contents.option = C_SIG; else if (!strcmp(arg, "subject")) atom->u.contents.option = C_SUB; @@ -691,9 +692,10 @@ static int raw_atom_parser(struct ref_format *format UNUSED, { if (!arg) atom->u.raw_data.option = RAW_BARE; - else if (!strcmp(arg, "size")) + else if (!strcmp(arg, "size")) { + atom->type = FIELD_ULONG; atom->u.raw_data.option = RAW_LENGTH; - else + } else return err_bad_arg(err, "raw", arg); return 0; } @@ -1859,7 +1861,8 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct exp v->s = xmemdupz(buf, buf_size); v->s_size = buf_size; } else if (atom->u.raw_data.option == RAW_LENGTH) { - v->s = xstrfmt("%"PRIuMAX, (uintmax_t)buf_size); + v->value = buf_size; + v->s = xstrfmt("%"PRIuMAX, v->value); } continue; } @@ -1885,9 +1888,10 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct exp v->s = strbuf_detach(&sb, NULL); } else if (atom->u.contents.option == C_BODY_DEP) v->s = xmemdupz(bodypos, bodylen); - else if (atom->u.contents.option == C_LENGTH) - v->s = xstrfmt("%"PRIuMAX, (uintmax_t)strlen(subpos)); - else if (atom->u.contents.option == C_BODY) + else if (atom->u.contents.option == C_LENGTH) { + v->value = strlen(subpos); + v->s = xstrfmt("%"PRIuMAX, v->value); + } else if (atom->u.contents.option == C_BODY) v->s = xmemdupz(bodypos, nonsiglen); else if (atom->u.contents.option == C_SIG) v->s = xmemdupz(sigpos, siglen); @@ -2267,6 +2271,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err) v->s_size = ATOM_SIZE_UNSPECIFIED; v->handler = append_atom; + v->value = 0; v->atom = atom; if (*name == '*') { |