summaryrefslogtreecommitdiff
path: root/t/t6024-recursive-merge.sh
diff options
context:
space:
mode:
authorLibravatar René Scharfe <rene.scharfe@lsrfire.ath.cx>2009-03-16 19:38:42 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-21 23:18:53 -0700
commit7ad3c52e2dc8e81aafa615fb8b65ad99b6a62172 (patch)
treefd033026ca72ab50206528825152c1ec0cce35fe /t/t6024-recursive-merge.sh
parentMerge branch 'maint-1.6.1' into maint (diff)
downloadtgif-7ad3c52e2dc8e81aafa615fb8b65ad99b6a62172.tar.xz
pickaxe: count regex matches only once
When --pickaxe-regex is used, forward past the end of matches instead of advancing to the byte after their start. This way matches count only once, even if the regular expression matches their tail -- like in the fixed-string fork of the code. E.g.: /.*/ used to count the number of bytes instead of the number of lines. /aa/ resulted in a count of two in "aaa" instead of one. Also document the fact that regexec() needs a NUL-terminated string as its second argument by adding an assert(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions