From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Feb 2016 21:37:10 +0000 (-0800)
Subject: Merge branch 'kn/ref-filter-atom-parsing'
X-Git-Tag: v2.8.0-rc0~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/26f7b5c79ace2df0475f8d04d1a5141e21615ddd?hp=-c

Merge branch 'kn/ref-filter-atom-parsing'

The ref-filter's format-parsing code has been refactored, in
preparation for "branch --format" and friends.

* kn/ref-filter-atom-parsing:
ref-filter: introduce objectname_atom_parser()
ref-filter: introduce contents_atom_parser()
ref-filter: introduce remote_ref_atom_parser()
ref-filter: align: introduce long-form syntax
ref-filter: introduce align_atom_parser()
ref-filter: introduce parse_align_position()
ref-filter: introduce color_atom_parser()
ref-filter: introduce parsing functions for each valid atom
ref-filter: introduce struct used_atom
ref-filter: bump 'used_atom' and related code to the top
ref-filter: use string_list_split over strbuf_split
---

26f7b5c79ace2df0475f8d04d1a5141e21615ddd
diff --combined Documentation/git-for-each-ref.txt
index 2e3e96f663,89b6300478..012e8f9a08
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@@ -133,24 -133,23 +133,28 @@@ color:
  
  align::
  	Left-, middle-, or right-align the content between
- 	%(align:...) and %(end). The "align:" is followed by `<width>`
- 	and `<position>` in any order separated by a comma, where the
- 	`<position>` is either left, right or middle, default being
- 	left and `<width>` is the total length of the content with
- 	alignment. If the contents length is more than the width then
- 	no alignment is performed. If used with '--quote' everything
- 	in between %(align:...) and %(end) is quoted, but if nested
- 	then only the topmost level performs quoting.
+ 	%(align:...) and %(end). The "align:" is followed by
+ 	`width=<width>` and `position=<position>` in any order
+ 	separated by a comma, where the `<position>` is either left,
+ 	right or middle, default being left and `<width>` is the total
+ 	length of the content with alignment. For brevity, the
+ 	"width=" and/or "position=" prefixes may be omitted, and bare
+ 	<width> and <position> used instead.  For instance,
+ 	`%(align:<width>,<position>)`. If the contents length is more
+ 	than the width then no alignment is performed. If used with
+ 	'--quote' everything in between %(align:...) and %(end) is
+ 	quoted, but if nested then only the topmost level performs
+ 	quoting.
  
  In addition to the above, for commit and tag objects, the header
  field names (`tree`, `parent`, `object`, `type`, and `tag`) can
  be used to specify the value in the header field.
  
 +For commit and tag objects, the special `creatordate` and `creator`
 +fields will correspond to the appropriate date or name-email-date tuple
 +from the `committer` or `tagger` fields depending on the object type.
 +These are intended for working on a mix of annotated and lightweight tags.
 +
  Fields that have name-email-date tuple as its value (`author`,
  `committer`, and `tagger`) can be suffixed with `name`, `email`,
  and `date` to extract the named component.
@@@ -162,8 -161,8 +166,8 @@@ line is 'contents:body', where body is 
  blank line.  The optional GPG signature is `contents:signature`.  The
  first `N` lines of the message is obtained using `contents:lines=N`.
  
 -For sorting purposes, fields with numeric values sort in numeric
 -order (`objectsize`, `authordate`, `committerdate`, `taggerdate`).
 +For sorting purposes, fields with numeric values sort in numeric order
 +(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`).
  All other fields are used to sort in their byte-value order.
  
  There is also an option to sort by versions, this can be done by using