From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Mar 2021 22:02:57 +0000 (-0800)
Subject: Merge branch 'hv/trailer-formatting'
X-Git-Tag: v2.31.0-rc1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28714238c8d482345ca17e8dd98d8cc328de24a8;p=thirdparty%2Fgit.git

Merge branch 'hv/trailer-formatting'

The logic to handle "trailer" related placeholders in the
"--format=" mechanisms in the "log" family and "for-each-ref"
family is getting unified.

* hv/trailer-formatting:
  ref-filter: use pretty.c logic for trailers
  pretty.c: capture invalid trailer argument
  pretty.c: refactor trailer logic to `format_set_trailers_options()`
  t6300: use function to test trailer options
---

28714238c8d482345ca17e8dd98d8cc328de24a8