]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jk/trailer-fixes' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:41 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:42 +0000 (22:57 +0900)
commite293824d00c243c6a7afb15324902f693ae751e8
tree20c5f5ca2a2067d064cff24eb5c83cbb18436467
parentcae598d9980661a978e2df4fb338518f7bf09572
parent66e83d9b41f7438cb167b9bb54093ebbf0532437
Merge branch 'jk/trailer-fixes' into maint

"git interpret-trailers" and its underlying machinery had a buggy
code that attempted to ignore patch text after commit log message,
which triggered in various codepaths that will always get the log
message alone and never get such an input.

* jk/trailer-fixes:
  append_signoff: use size_t for string offsets
  sequencer: ignore "---" divider when parsing trailers
  pretty, ref-filter: format %(trailers) with no_divider option
  interpret-trailers: allow suppressing "---" divider
  interpret-trailers: tighten check for "---" patch boundary
  trailer: pass process_trailer_opts to trailer_info_get()
  trailer: use size_t for iterating trailer list
  trailer: use size_t for string offsets
Documentation/git-interpret-trailers.txt
commit.c
commit.h
pretty.c
ref-filter.c
sequencer.c
sequencer.h
t/t6300-for-each-ref.sh
t/t7501-commit.sh
trailer.h