On Fri, 13 Dec 2019 at 08:38, Ed Maste <emaste@xxxxxxxxxxx> wrote: > > On Mon, 2 Dec 2019 at 09:16, Junio C Hamano <gitster@xxxxxxxxx> wrote: > > > > * ln/userdiff-elixir (2019-11-10) 1 commit > > (merged to 'next' on 2019-11-19 at 6318918ba8) > > + userdiff: add Elixir to supported userdiff languages > > t4018-diff-funcname.sh is failing on FreeBSD with this change, > fatal: invalid regular expression: > |[@:]?[a-zA-Z0-9@_?!]+|[-+]?0[xob][0-9a-fA-F]+|[-+]?[0-9][0-9_.]*([eE][-+]?[0-9_]+)?|:?(\+\+|--|\.\.|~~~|<>|\^\^\^|<?\|>|<<<?|>?>>|<<?~|~>?>|<~>|<=|>=|===?|!==?|=~|&&&?|\|\|\|?|=>|<-|\\\\|->)|:?%[A-Za-z0-9_.]\{\}?|[^[:space:]]|[<C0>-<FF>][<80>-<BF>]+ There was an empty subexpression in the first regex; just sent a patch to fix it. (It'd be great if we can merge .cirrus.yml and enable FreeBSD CI for 2.25.)