mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/trailer-fixes'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2018-09-17 13:53:54 -07:00
parent 30035d1d60 66e83d9b41
commit fba9654364
14 changed files with 175 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sequencer.c
View File

@ -226,13 +226,16 @@ static const char *get_todo_path(const struct replay_opts *opts)
* Returns 3 when sob exists within conforming footer as last entry
*/
static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob,
int ignore_footer)
size_t ignore_footer)
{
struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
struct trailer_info info;
int i;
size_t i;
int found_sob = 0, found_sob_last = 0;
trailer_info_get(&info, sb->buf);
opts.no_divider = 1;
trailer_info_get(&info, sb->buf, &opts);
if (info.trailer_start == info.trailer_end)
return 0;
@ -3829,7 +3832,7 @@ int sequencer_pick_revisions(struct replay_opts *opts)
return res;
}
void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag)
void append_signoff(struct strbuf *msgbuf, size_t ignore_footer, unsigned flag)
{
unsigned no_dup_sob = flag & APPEND_SIGNOFF_DEDUP;
struct strbuf sob = STRBUF_INIT;