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,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id A7A061F698 for ; Tue, 27 Dec 2022 18:27:08 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=NFxGbydq; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229798AbiL0S1C (ORCPT ); Tue, 27 Dec 2022 13:27:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229632AbiL0S1A (ORCPT ); Tue, 27 Dec 2022 13:27:00 -0500 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAF18B7DB for ; Tue, 27 Dec 2022 10:26:59 -0800 (PST) Received: by mail-ej1-x632.google.com with SMTP id u9so33753470ejo.0 for ; Tue, 27 Dec 2022 10:26:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:in-reply-to :user-agent:references:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=lM9BWYnDd4/iM275GJ+UR3FBFdU+ZRUisq2fbYjzigY=; b=NFxGbydqzSV9nvGOGpZEXZZ8xGKlAU4CgheUGGEYACcJ63lcITk45o3hdx05lHhfda JXpCYcoAYRZp2w61xCXWqtlR3iRNm0We9PuMBi2XdN8WVEeNVqn60mzyVzKkdSV09bKL DvLYQv2G+jTXryPEhV4CCKQOmArxHGA5WnupslO6t+0yE3OMzh7wYOhNYZ8JQ2wLPmzS QsyPAJW/35BVDd3g46xYY1hq1BN3vXsfU6Zo92zVqclHZvNTeTeybIAmgN5XVy8fMpZE O4hTumUMS3qe/prZSpHEOBf1LrD/ObiEzcUA5fh1YPwP2G16SCuMzZ5rImQCyK44pNnE OAQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:in-reply-to :user-agent:references:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=lM9BWYnDd4/iM275GJ+UR3FBFdU+ZRUisq2fbYjzigY=; b=acD8RPWcS9Y2bKMXbs5G1Ap/DMz3d1T5prjLTiLiOsVhzFnDPjfXC8XKbwZn7rBl9p eRRy/tUts9pXbeLf9ZiSB8qHhf66AaLJjnRl61cEOnjGDF2BIezaYwznViiY+8dVytxB aHglGMBChxhGJwAy4ISPAPUqd/eJfJeFTYPm1fWnvpmrlkAN8W1VpaIA18dxlbwekhBJ l41GqXMCIy1qTrlQqx8yHkWpbjEcGNvogmD4Z0gy9vJhRM6R9J++KOlHE2D34/NvNi8L cwgPWGVwAGgBkDNfwmmEu2003Il/uOH/McC1qkZGZVTbqRF2a7cJw17oFLshQa5nPBFS uYHA== X-Gm-Message-State: AFqh2krsjnuO/xBIVgA6R/l5jvJ65sqfnAuf3srWa0iAO1QNuCczbSAl KI/kSKRupNcTQCGf0L8XeH8= X-Google-Smtp-Source: AMrXdXsDdYA0EiABQ8RTxTPpkKWDAgrYGHcj8gjBwAIqYq9MVh6XQL1czRJNBvQrq6wvcT5I8J5U4w== X-Received: by 2002:a17:906:bc47:b0:78d:f455:3110 with SMTP id s7-20020a170906bc4700b0078df4553110mr16969922ejv.56.1672165618452; Tue, 27 Dec 2022 10:26:58 -0800 (PST) Received: from gmgdl (j84076.upc-j.chello.nl. [24.132.84.76]) by smtp.gmail.com with ESMTPSA id l22-20020a1709065a9600b00780982d77d1sm6359288ejq.154.2022.12.27.10.26.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Dec 2022 10:26:57 -0800 (PST) Received: from avar by gmgdl with local (Exim 4.96) (envelope-from ) id 1pAEfB-009Mom-1a; Tue, 27 Dec 2022 19:26:57 +0100 From: =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason To: phillip.wood@dunelm.org.uk Cc: git@vger.kernel.org, Junio C Hamano , =?utf-8?Q?Ren?= =?utf-8?Q?=C3=A9?= Scharfe , Eric Sunshine , Torsten =?utf-8?Q?B=C3=B6gershausen?= Subject: Re: [PATCH v4 6/6] tests: don't lose misc "git" exit codes Date: Tue, 27 Dec 2022 19:18:18 +0100 References: <6efe13ea-8782-2337-1626-9687e2219680@dunelm.org.uk> User-agent: Debian GNU/Linux bookworm/sid; Emacs 27.1; mu4e 1.9.0 In-reply-to: <6efe13ea-8782-2337-1626-9687e2219680@dunelm.org.uk> Message-ID: <221227.86cz84vh1q.gmgdl@evledraar.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Dec 27 2022, Phillip Wood wrote: > Hi =C3=86var > > On 19/12/2022 10:19, =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason wrote: >> Fix a few miscellaneous cases where: >> - We lost the "git" exit code via "git ... | grep" >> - Likewise by having a $(git) argument to git itself >> - Used "test -z" to check that a command emitted no output, we can use >> "test_must_be_empty" and &&-chaining instead. >> Signed-off-by: =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason >> [...] >> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh >> index 5841f280fb2..f1fe5d60677 100755 >> --- a/t/t3701-add-interactive.sh >> +++ b/t/t3701-add-interactive.sh >> @@ -296,9 +296,11 @@ test_expect_success FILEMODE 'stage mode and hunk' ' >> echo content >>file && >> chmod +x file && >> printf "y\\ny\\n" | git add -p && >> - git diff --cached file | grep "new mode" && >> - git diff --cached file | grep "+content" && >> - test -z "$(git diff file)" >> + git diff --cached file >out && >> + grep "new mode" out && >> + grep "+content" out && >> + git diff file >out && >> + test_must_be_empty out > > "git diff --exit-code file" would suffice here, we don't need to > redirect the output and check that it is empty. Correct. Or even "git diff-files -s --exit-code", which might make things clearer still, or have this use the "diff_cmp" helper defined in the test file, as most of its siblings do. But as with a sibling comment of mine I wanted to avoid starting to refactoring these tests for general betterment, and just to narrowly avoid losing the exit code.