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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.8 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_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id AB06E1F953 for ; Tue, 11 Jan 2022 11:12:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238498AbiAKLMQ (ORCPT ); Tue, 11 Jan 2022 06:12:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238050AbiAKLMP (ORCPT ); Tue, 11 Jan 2022 06:12:15 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A829DC06173F for ; Tue, 11 Jan 2022 03:12:14 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id q8so32163356wra.12 for ; Tue, 11 Jan 2022 03:12:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=qxLEDaVVXuSkRbZPv11EOStJOOrvJtXLEYzIeB0ifgQ=; b=jhWmpjj3HajawXBrKlXKfCIyKPqt6wwd48y6BygT5nJGtzTDdYZMd0OMHSGsXTt2Ro E1xp8XmmlbpjgofyF3JmMltlWQ2l9s69K0wSvfsR5ohR415WPdr6nb145pORDTZvdmt0 7fage0BLEEu69y2K/YyMOV5QERvFPKvNt8m4wi/qQgND+JY+ZTpNnMcYg0tShxV2DS0q oL27wac/fYEavy70nfROnsuq7GprexdXhAQos4rNmGUWfub9JZvUtp0vC/Vx54kVz2DQ PH6jokz/mVPDuD5a8Rbvi8lVN+TlQfwNUocA4hVZn9h0MADJIPa6df6dD/9DPlo5F5OH +kTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=qxLEDaVVXuSkRbZPv11EOStJOOrvJtXLEYzIeB0ifgQ=; b=ETA6iKRI7OytzM4HYGncuoSMqJYnXoPaI+Aw8HhnYK3VNJ0LQkC1eleupBmAS6li3h FzR1Ci9O8KvDIuT90zMQvAvfKLjPOEFrjYShvQCRl83Ipw+cEsuz+GJOl1t6XsAGzLuN qLXdgtDn7qHd/sSyZJbc8BkGhYTSbLI192aEEroqPzc7W6Ebwhcroc0IU21swH7l0zG7 do6CJwd17lxpnYU5QA0KdrGQGdCy3ZYle4OFa9IGheiO7rT+XXLokkxNRhay9SUtu0Mu K4SI2v2SadVHQ1pV0JNZuoUVLfMrip4wUtDUzoUoJIDwbN+XcJrp7sy1c6fGsBOZvgJ2 2cPA== X-Gm-Message-State: AOAM532U/zs9zKOd861tfen3wOItK00vPijL4T3PngLEuH2NtHzPFe8Z FhnNMXbTuffhmaSo/PIKbxnXsuyvQx0= X-Google-Smtp-Source: ABdhPJwmHxtVzLzJ0nfcPJzreckKXLnrTFlx+isJLj29KtJRUKpJlzlHv+dcvSu5UukvqVjAKQTxcw== X-Received: by 2002:a5d:430e:: with SMTP id h14mr3447399wrq.99.1641899532837; Tue, 11 Jan 2022 03:12:12 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i3sm1463153wrn.11.2022.01.11.03.12.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 03:12:12 -0800 (PST) Message-Id: In-Reply-To: References: From: "Phillip Wood via GitGitGadget" Date: Tue, 11 Jan 2022 11:12:09 +0000 Subject: [PATCH v2 1/2] t3701: clean up hunk splitting tests Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , SZEDER =?UTF-8?Q?G=C3=A1bor?= , =?UTF-8?Q?=C3=86var_Arnfj=C3=B6r=C3=B0?= Bjarmason , Phillip Wood , Phillip Wood Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Phillip Wood Clean up some test constructs in preparation for extending the tests in the next commit. There are three small changes, I've grouped them together as they're so small it didn't seem worth creating three separate commits. 1 - "cat file | sed expression" is better written as "sed expression file". 2 - Follow our usual practice of redirecting the output of git commands to a file rather than piping it into another command. 3 - Use test_write_lines rather than 'printf "%s\n"'. Signed-off-by: Phillip Wood --- t/t3701-add-interactive.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 207714655f2..77de0029ba5 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -347,7 +347,7 @@ test_expect_success 'setup patch' ' # Expected output, diff is similar to the patch but w/ diff at the top test_expect_success 'setup expected' ' echo diff --git a/file b/file >expected && - cat patch |sed "/^index/s/ 100644/ 100755/" >>expected && + sed "/^index/s/ 100644/ 100755/" patch >>expected && cat >expected-output <<-\EOF --- a/file +++ b/file @@ -373,9 +373,9 @@ test_expect_success 'setup expected' ' test_expect_success 'add first line works' ' git commit -am "clear local changes" && git apply patch && - printf "%s\n" s y y | git add -p file 2>error | - sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \ - -e "/^[-+@ \\\\]"/p >output && + test_write_lines s y y | git add -p file 2>error >raw-output && + sed -n -e "s/^([1-2]\/[1-2]) Stage this hunk[^@]*\(@@ .*\)/\1/" \ + -e "/^[-+@ \\\\]"/p raw-output >output && test_must_be_empty error && git diff --cached >diff && diff_cmp expected diff && -- gitgitgadget