"Hariom Verma via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > -@@ ref-filter.c: static struct ref_to_worktree_map { > - struct worktree **worktrees; > - } ref_to_worktree_map; > +@@ ref-filter.c: static struct used_atom { > + enum { O_FULL, O_LENGTH, O_SHORT } option; > + unsigned int length; > + } objectname; > ++ struct email_option { > ++ enum { EO_RAW, EO_TRIM, EO_LOCALPART } option; > ++ } email_option; > + struct refname_atom refname; > + char *head; > + } u; I'll try to find enough time to read the body of the series sometime later this week, but this interdiff alone smells that this is much closer to being correct (no, I am not saying I spotted a bug, but it certainly looks liek it is on the right track, relative to what I saw the last time, to be right). A good test for this new feature may be to try using "<%(authoremail:localpart)> <%(committeremail:trim)>" as a format to make sure e-mail options are done per-atom. Thanks.