summaryrefslogtreecommitdiff
path: root/levenshtein.c
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2016-10-21 17:55:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-21 18:48:35 (GMT)
commit146245063e286d5a38b146bd5a38da958bd3957b (patch)
tree23fa72e5614b7aa4c4e12df2ccd01dbcc80ae589 /levenshtein.c
parentfdbf4510aeb7e7b860c2ee77b8a4a3c5787fe182 (diff)
downloadgit-146245063e286d5a38b146bd5a38da958bd3957b.zip
git-146245063e286d5a38b146bd5a38da958bd3957b.tar.gz
git-146245063e286d5a38b146bd5a38da958bd3957b.tar.bz2
trailer: allow non-trailers in trailer block
Currently, interpret-trailers requires all lines of a trailer block to be trailers (or comments) - if not it would not identify that block as a trailer block, and thus create its own trailer block, inserting a blank line. For example: echo -e "\nSigned-off-by: x\nnot trailer" | git interpret-trailers --trailer "c: d" would result in: Signed-off-by: x not trailer c: d Relax the definition of a trailer block to require that the trailers (i) are all trailers, or (ii) contain at least one Git-generated trailer and consists of at least 25% trailers. Signed-off-by: x not trailer c: d (i) is the existing functionality. (ii) allows arbitrary lines to be included in trailer blocks, like those in [1], and still allow interpret-trailers to be used. [1] https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable/+/e7d316a02f683864a12389f8808570e37fb90aa3 Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'levenshtein.c')
0 files changed, 0 insertions, 0 deletions