]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'hv/ref-filter-trailers-atom-parsing-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2020 22:49:47 +0000 (15:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 31 Aug 2020 22:49:47 +0000 (15:49 -0700)
The parser for "git for-each-ref --format=..." was too loose when
parsing the "%(trailers...)" atom, and forgot that "trailers" and
"trailers:<modifiers>" 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

1  2 
ref-filter.c
t/t6300-for-each-ref.sh

diff --cc ref-filter.c
Simple merge
Simple merge