From patchwork Fri Dec 13 17:55:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Maste X-Patchwork-Id: 11290905 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F7A618B6 for ; Fri, 13 Dec 2019 20:38:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1578246C0 for ; Fri, 13 Dec 2019 20:38:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728605AbfLMRzh (ORCPT ); Fri, 13 Dec 2019 12:55:37 -0500 Received: from mx2.freebsd.org ([96.47.72.81]:23303 "EHLO mx2.freebsd.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726404AbfLMRzh (ORCPT ); Fri, 13 Dec 2019 12:55:37 -0500 Received: from mx1.freebsd.org (mx1.freebsd.org [96.47.72.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mx1.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx2.freebsd.org (Postfix) with ESMTPS id 54C986B0AB; Fri, 13 Dec 2019 17:55:36 +0000 (UTC) (envelope-from emaste@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47ZJHD0pkqz4J0c; Fri, 13 Dec 2019 17:55:36 +0000 (UTC) (envelope-from emaste@freebsd.org) Received: by freefall.freebsd.org (Postfix, from userid 1079) id EEA4A5649; Fri, 13 Dec 2019 17:55:35 +0000 (UTC) From: Ed Maste To: git@vger.kernel.org Cc: peff@peff.net, lukasz@niemier.pl, Ed Maste Subject: [PATCH v2] userdiff: remove empty subexpression from elixir regex Date: Fri, 13 Dec 2019 17:55:35 +0000 Message-Id: <20191213175535.87725-1-emaste@FreeBSD.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20191213173902.71541-1-emaste@FreeBSD.org> References: <20191213173902.71541-1-emaste@FreeBSD.org> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The regex failed to compile on FreeBSD. Fixes: a807200f67588f6e Signed-off-by: Ed Maste Tested-by: Johannes Sixt Signed-off-by: Ed Maste Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- Add /* -- */ to make things more clear and be consistent with other patterns. userdiff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/userdiff.c b/userdiff.c index 324916f20f..efbe05e5a5 100644 --- a/userdiff.c +++ b/userdiff.c @@ -34,8 +34,9 @@ PATTERNS("dts", "|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"), PATTERNS("elixir", "^[ \t]*((def(macro|module|impl|protocol|p)?|test)[ \t].*)$", + /* -- */ /* Atoms, names, and module attributes */ - "|[@:]?[a-zA-Z0-9@_?!]+" + "[@:]?[a-zA-Z0-9@_?!]+" /* Numbers with specific base */ "|[-+]?0[xob][0-9a-fA-F]+" /* Numbers */