This is built off jt/trailer-with-cruft (commit 60ef86a). This patch set makes "commit -s", "cherry-pick -x", and "format-patch --signoff" use the new trailer definition implemented in jt/trailer-with-cruft, with some refactoring along the way. With this patch set, the aforementioned commands would now handle trailers like those described in [1]. [1] <84f28caa-2e4b-1231-1a76-3b7e765c0b61@xxxxxxxxxx> Jonathan Tan (4): commit: make ignore_non_trailer take buf/len trailer: avoid unnecessary splitting on lines trailer: have function to describe trailer layout sequencer: use trailer's trailer layout builtin/commit.c | 2 +- commit.c | 22 ++-- commit.h | 2 +- sequencer.c | 75 +++--------- t/t3511-cherry-pick-x.sh | 16 ++- t/t4014-format-patch.sh | 40 +++++-- t/t7501-commit.sh | 36 ++++++ trailer.c | 295 ++++++++++++++++++++++++++++------------------- trailer.h | 25 ++++ 9 files changed, 313 insertions(+), 200 deletions(-) -- 2.8.0.rc3.226.g39d4020