summaryrefslogtreecommitdiff
path: root/t/t9114-git-svn-dcommit-merge.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2018-08-22 20:48:21 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-23 10:08:51 -0700
commitc188668e387509565237a865a1c63e890f6bbcd7 (patch)
treede41433adf73551f80cb62f49061816644a12ce8 /t/t9114-git-svn-dcommit-merge.sh
parenttrailer: pass process_trailer_opts to trailer_info_get() (diff)
downloadtgif-c188668e387509565237a865a1c63e890f6bbcd7.tar.xz
interpret-trailers: tighten check for "---" patch boundary
The interpret-trailers command accepts not only raw commit messages, but it also can manipulate trailers in format-patch output. That means it must find the "---" boundary separating the commit message from the patch. However, it does so by looking for any line starting with "---", regardless of whether there is further content. This is overly lax compared to the parsing done in mailinfo.c's patchbreak(), and may cause false positives (e.g., t/perf output tables uses dashes; if you cut and paste them into your commit message, it fools the parser). We could try to reuse patchbreak() here, but it actually has several heuristics that are not of interest to us (e.g., matching "diff -" without a three-dash separator or even a CVS "Index:" line). We're not interested in taking in whatever random cruft people may send, but rather handling git-formatted patches. Note that the existing documentation was written in a loose way, so technically we are changing the behavior from what it said. But this should implement the original intent in a more accurate way. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9114-git-svn-dcommit-merge.sh')
0 files changed, 0 insertions, 0 deletions