diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:47 -0700 |
| commit | e17723842b4fd42215ebf9c7ee5ab0bdfbe5a402 (patch) | |
| tree | 3b969dd1f4f8c01e841600503d93d893f68f45f9 /builtin/merge-recursive.c | |
| parent | Merge branch 'jt/promisor-pack-fix' (diff) | |
| parent | ref-filter: 'contents:trailers' show error if `:` is missing (diff) | |
| download | tgif-e17723842b4fd42215ebf9c7ee5ab0bdfbe5a402.tar.xz | |
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:<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
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions