From: Junio C Hamano Date: Mon, 31 Aug 2020 22:49:47 +0000 (-0700) Subject: Merge branch 'hv/ref-filter-trailers-atom-parsing-fix' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e17723842b4fd42215ebf9c7ee5ab0bdfbe5a402;p=git.git Merge branch 'hv/ref-filter-trailers-atom-parsing-fix' The parser for "git for-each-ref --format=..." was too loose when parsing the "%(trailers...)" atom, and forgot that "trailers" and "trailers:" are the only two allowed forms, which has been corrected. * hv/ref-filter-trailers-atom-parsing-fix: ref-filter: 'contents:trailers' show error if `:` is missing t6300: unify %(trailers) and %(contents:trailers) tests --- e17723842b4fd42215ebf9c7ee5ab0bdfbe5a402