From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-0.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id CB4B71F4D7 for ; Tue, 21 Jun 2022 16:57:42 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=pobox.com header.i=@pobox.com header.b="WrqX9Xg7"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352240AbiFUQ4B (ORCPT ); Tue, 21 Jun 2022 12:56:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352234AbiFUQz6 (ORCPT ); Tue, 21 Jun 2022 12:55:58 -0400 Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6DE3C1C92E for ; Tue, 21 Jun 2022 09:55:57 -0700 (PDT) Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id E042C199093; Tue, 21 Jun 2022 12:55:56 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=Ph0SA/W/OJqf LBposLB4P2iCkh12lpWaXcZEqKiY8ss=; b=WrqX9Xg7U9C+ydjZ6c1t90EjvXfZ OzSECB2eDotvp38KukMOZW9hr0Kmi1v4Cyn3ieE3EC7JV1r/w3Pjb3GgzHYNVdRx MHMP7cKoDJu3Es9534GmPDPE9iHwpj5p6SQUr1BSnrG1DSW8b6ZQCM8zol/+K8mO bcDhx+7zfWtZAcA= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id D8DD0199092; Tue, 21 Jun 2022 12:55:56 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.82.80.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 7E57719908B; Tue, 21 Jun 2022 12:55:53 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: =?utf-8?Q?Ren=C3=A9?= Scharfe Cc: =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , git@vger.kernel.org, =?utf-8?B?TWljaGHFgiBLxJlwaWXFhA==?= Subject: Re: [PATCH 1/2] combine-diff: abort if --ignore-matching-lines is given References: <220524.86leurw3my.gmgdl@evledraar.gmail.com> <220524.86v8tuvfl1.gmgdl@evledraar.gmail.com> <49bcadd1-7dc2-d5ee-36a5-59456450aeca@web.de> <95d7609e-4cb5-c87e-0120-144f1f094241@web.de> Date: Tue, 21 Jun 2022 09:55:52 -0700 In-Reply-To: <95d7609e-4cb5-c87e-0120-144f1f094241@web.de> (=?utf-8?Q?=22R?= =?utf-8?Q?en=C3=A9?= Scharfe"'s message of "Tue, 21 Jun 2022 17:58:50 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Pobox-Relay-ID: 03052A42-F183-11EC-9823-CBA7845BAAA9-77302942!pb-smtp21.pobox.com Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Ren=C3=A9 Scharfe writes: >>> + if (opt->ignore_regex_nr) >>> + die("combined diff and '%s' cannot be used together", >>> + "--ignore-matching-lines"); >> >> "X cannot be used together _with_ Y" perhaps? > > Not sure, but that type of message was recently unified (most common > case: "options '%s' and '%s' cannot be used together") and "with" is > only used in an untranslated BUG: Ah, sorry, I completely misread the original as "combined diff cannot be used together with ignore-matching-lines". Sorry for the noise.