From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id AF4651F44D for ; Sat, 16 Mar 2024 01:50:13 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=ZPV+bBaP; dkim-atps=neutral Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 3F4BF1F21C60 for ; Sat, 16 Mar 2024 01:50:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9DD7323B1; Sat, 16 Mar 2024 01:50:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b="ZPV+bBaP" Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84CEB184D for ; Sat, 16 Mar 2024 01:50:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710553803; cv=none; b=tkDe+hIenDInYokj4ISstxVEff6IQYnmHBJzoxytvhOAsN9hVwut7ubh4OW4OfP6kQZRFVXGTSrsnAf2KzIONy2SqRln4FA0iWBwTaiiZ71XBnUbnbKKqv7Tp70Df+/DOKNfQVHN7P+ydjZeVDuy3cOuOTF+SEbNhwGfXkhyt/c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710553803; c=relaxed/simple; bh=XOLLjREfCpECFBvEwckNDiG/GQceHCTaISzxWujTJJ0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=HlsEBpaqtbMYI+9GAUziDEUbwGz+YOUS8j27xHD2rXpIAkdjsEu1+gOmTWBdqP5kc5/VWpCFhXrQsSgHga1fAARpgGLiFqp1AXvYLr4T527z05wsoMweZXnXEzZvfEctFemSjI8/SJ67CaXgm6gfuDoVf/IvaOeiPW0ZF6vMNbU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com; spf=none smtp.mailfrom=ttaylorr.com; dkim=pass (2048-bit key) header.d=ttaylorr-com.20230601.gappssmtp.com header.i=@ttaylorr-com.20230601.gappssmtp.com header.b=ZPV+bBaP; arc=none smtp.client-ip=209.85.219.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ttaylorr.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ttaylorr.com Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-690cbf99143so14839216d6.3 for ; Fri, 15 Mar 2024 18:50:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ttaylorr-com.20230601.gappssmtp.com; s=20230601; t=1710553800; x=1711158600; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=KoKvplAH8HrizHHdnc2KwWisyRXtMSqbXOACZ9zE0fA=; b=ZPV+bBaPTaX7pvlGqGK1i9yIqQPPjUYdeGtPvHT4ySypPh9t1nHLF0gt7JOP9Hf/He SAj6KzYOhWKcw1CwKjBmefyXuSAVA21F8ZQX7sdzCoN44M38D9QN5WisICnQTxwc1jaL k04Y9SZFQI3M1X3wkTzmrXb5dHI2bD2aryR8dBurNLzEixTLx8gbS5shVhPs2Le20/44 boIPTRgKHYmZPTj4dJ10+CJJuyZmF+rlTMTWF8Khe5NqqFmc/J2sYfISy1V3TDEJcQor xPf9F4kzzdPL7AXHFOgAGdsE0LDWoCEf529qaF+ZaWGK3LeOzvSHai0wtlMPsozGMPqU NCsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710553800; x=1711158600; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KoKvplAH8HrizHHdnc2KwWisyRXtMSqbXOACZ9zE0fA=; b=Q0EQUutKteaAjRvRriULwSf/0o3naxrsVpLqbhFK5sMfQddB9IjHX9I9+W+g89Davs YVwocWXqj9yKWzGM4LqI8oertmvsk3YZPlaOeipyYqFRJPa60fG9MQGnVVQXgAGUJL1N qaV2/s7g7vAm67/zB3B0uWxWFebEma7a3k4w/Z40T6NYQQlnvjleHOvESnjAKvJLyx7H ph1G8jg4KX1cD3PW+vVYp6oQBM12zWLbDYCFXBwSWH6d62jCRJY72MlT8RDDnKPZGcIU QsdgkdamMS17xw83d50nKuysN4P9A/1aOYgSxdRj9ewglSEn5hO4xjnKJaEJ+bvy/FFI isiw== X-Gm-Message-State: AOJu0Yy0Oqzck6xlpQQYaaytZsIzr9BnMO0tGwjJfmHu9Til1V5x0PAs pltuoiv3TbVOdwv/cr9Dn8HKid5STpTg/u8DGvbel8dVrBfopo5YNQKR9HFMo5A= X-Google-Smtp-Source: AGHT+IGd+JPWy38mdU34zlTcc7nOLNMCY7heRbUTIe93QrnGzBGGwOWk+14ZibDgJux1yLxLMbkyMA== X-Received: by 2002:a0c:f88e:0:b0:690:b8d3:97b9 with SMTP id u14-20020a0cf88e000000b00690b8d397b9mr7009342qvn.59.1710553800339; Fri, 15 Mar 2024 18:50:00 -0700 (PDT) Received: from localhost (104-178-186-189.lightspeed.milwwi.sbcglobal.net. [104.178.186.189]) by smtp.gmail.com with ESMTPSA id gc14-20020a056214230e00b00690fd3f6e3esm2615407qvb.104.2024.03.15.18.49.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 18:50:00 -0700 (PDT) Date: Fri, 15 Mar 2024 21:49:59 -0400 From: Taylor Blau To: Beat Bolli Cc: git@vger.kernel.org, Junio C Hamano , Beat Bolli Subject: Re: [PATCH v2 16/22] t/t3*: merge a "grep | awk" pipeline Message-ID: References: <20240305212533.12947-1-dev+git@drbeat.li> <20240315194620.10713-1-dev+git@drbeat.li> <20240315194620.10713-17-dev+git@drbeat.li> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240315194620.10713-17-dev+git@drbeat.li> On Fri, Mar 15, 2024 at 08:46:13PM +0100, Beat Bolli wrote: > Signed-off-by: Beat Bolli > --- > t/t3920-crlf-messages.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh > index 5eed640a6825..50ae222f0842 100755 > --- a/t/t3920-crlf-messages.sh > +++ b/t/t3920-crlf-messages.sh > @@ -97,7 +97,7 @@ test_expect_success 'branch: --verbose works with messages using CRLF' ' > git branch -v >tmp && > # Remove first two columns, and the line for the currently checked out branch > current=$(git branch --show-current) && > - grep -v $current actual && > + awk "/$current/ { next } { \$1 = \$2 = \"\" } 1" actual && I think that using `next` here is fine to ignore lines that match `$current`, but the canonical approach would probably be using the `!` operator instead to negate the match, like so: awk "!/$current/ { \$1 = \$2 = \"\" } 1" actual && Not worth a reroll, of course, just something that I noticed while reading. Thanks, Taylor