From patchwork Mon Jan 18 13:30:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 12027413 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 835ADC43381 for ; Mon, 18 Jan 2021 14:01:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5AA22221FC for ; Mon, 18 Jan 2021 14:01:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392232AbhARNcA (ORCPT ); Mon, 18 Jan 2021 08:32:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392322AbhARNbQ (ORCPT ); Mon, 18 Jan 2021 08:31:16 -0500 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9F89C061573 for ; Mon, 18 Jan 2021 05:30:35 -0800 (PST) Received: by mail-pl1-x630.google.com with SMTP id d4so8659473plh.5 for ; Mon, 18 Jan 2021 05:30:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3i9X0mN47i+y4sKDZLYL5BADmn3zXuGn5YEz8RNtxcA=; b=iFBLX1qjWF4uwBH3QF9wu9onI5dhRXlOW4Ro+jgn3f4vRCZSrMs7dEgJWBL0a8hHVn cZ3IRv7illP8re2HtUmlUnPNIAt6egPhRlnZxETGU3fPt2+eg/cLBxMHbXJRiX9RQHoN URA4eY//LJYRmdhORQOTspBQP9Ox6qDmdGij+FrxKl8dqrbenniOVaVyc8c6fK45f3xx afAmf8s9lwik9YjIqp63A4Xm0DUHC4hfoGbiojpiGNEnuU42+xl9UDbz33NxR2GjX3W3 pYckiZ2tG6wZImCQKgusE23DKwuPyC3igNfp2kCEWQPbuPojVpn7fFEsDeTfMJDzryxp NxSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3i9X0mN47i+y4sKDZLYL5BADmn3zXuGn5YEz8RNtxcA=; b=BkK+epZjvfBnXYsR1Jou+1UJ66f3IXqS4K6GMDe42e8qppZfZylBBeciD59fQ+Tqpc tB0iZCojyqfydTqERDf+1TwzfczyRTSjpoLXr5+EagOj0wdDx1sWalgp+VT0GOp5ZMko ACNOyJr3/sz1Q9LhuI8JCGhUDoffWX/kSmMLAhjJjrrqWheyoC6zQWkk8xRGwHbfIB72 +MScweZ6xLQHmeAIaShn0tMOUcDqiC/Ui27X4tbuauIFgcjh/9DtJQTayhTq87h6kHdo 7WAfq8UCbC27enDAIwUVQ5NO6gC4PzLSgjRmonK1shrrArLIhao0B/ss5lW95F5+KA8x ZuVQ== X-Gm-Message-State: AOAM5322GFq15YIXUpBZXqPiohlwQkMZc5oU/FM+StVDZ7hUusWWJkv5 AfHbKcsgwFRaKFieZhg1++A= X-Google-Smtp-Source: ABdhPJx/H2S7Q8e3ULoPMZA3oQeGKiBxCIzNtOAhAQmY5gxT0gjj+GIy/6r6RVRBWObZSJpGdLdzgQ== X-Received: by 2002:a17:90a:d24a:: with SMTP id o10mr24976014pjw.160.1610976635051; Mon, 18 Jan 2021 05:30:35 -0800 (PST) Received: from tigtog.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id m11sm3160010pjz.44.2021.01.18.05.30.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jan 2021 05:30:33 -0800 (PST) From: Jiang Xin To: Junio C Hamano , Git List , =?utf-8?q?SZEDER_G=C3=A1bor?= Cc: Jiang Xin Subject: [PATCH 1/2] t5411: remove file after use to prevent overwriting Date: Mon, 18 Jan 2021 08:30:10 -0500 Message-Id: <20210118133011.15331-1-worldhello.net@gmail.com> X-Mailer: git-send-email 2.26.0.rc0 In-Reply-To: <20210117222151.GY8396@szeder.dev> References: <20210117222151.GY8396@szeder.dev> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jiang Xin SZEDER reported that t5411 failed in Travis CI's s390x environment a couple of times, and could be reproduced with '--stress' test on this specific environment. The test failure messages might look like this: + test_cmp expect actual --- expect 2021-01-17 21:55:23.430750004 +0000 +++ actual 2021-01-17 21:55:23.430750004 +0000 @@ -1 +1 @@ - refs/heads/main + refs/heads/maifatal: the remote end hung up unexpectedly error: last command exited with $?=1 not ok 86 - proc-receive: not support push options (builtin protocol) The file 'actual' is filtered from the file 'out' which contains result of 'git show-ref' command. Due to the error messages from other process is written into the file 'out' accidentally, t5411 failed. SZEDER finds the root cause of this issue: - 'git push' is executed with its standard output and error redirected to the file 'out'. - 'git push' executes 'git receive-pack' internally, which inherits the open file descriptors, so its output and error goes into that same 'out' file. - 'git push' ends without waiting for the close of 'git-receive-pack' for some cases, and the file 'out' is reused for test of 'git show-ref' afterwards. - A mixture of the output of 'git show-ref' abd 'git receive-pack' leads to this issue. To resolve this issue, we can remove the file 'out' after use. The long-running 'git receive-pack' will not redirect its output to the new created 'out' file which has a different file descriptor. Reported-by: SZEDER Gábor Signed-off-by: Jiang Xin --- t/t5411/test-0000-standard-git-push.sh | 4 ++++ .../test-0001-standard-git-push--porcelain.sh | 4 ++++ t/t5411/test-0002-pre-receive-declined.sh | 2 ++ ...est-0003-pre-receive-declined--porcelain.sh | 2 ++ t/t5411/test-0011-no-hook-error.sh | 4 ++++ t/t5411/test-0012-no-hook-error--porcelain.sh | 4 ++++ t/t5411/test-0013-bad-protocol.sh | 18 ++++++++++++++++++ t/t5411/test-0014-bad-protocol--porcelain.sh | 18 ++++++++++++++++++ t/t5411/test-0020-report-ng.sh | 4 ++++ t/t5411/test-0021-report-ng--porcelain.sh | 4 ++++ t/t5411/test-0022-report-unexpect-ref.sh | 2 ++ ...test-0023-report-unexpect-ref--porcelain.sh | 2 ++ t/t5411/test-0024-report-unknown-ref.sh | 2 ++ .../test-0025-report-unknown-ref--porcelain.sh | 2 ++ t/t5411/test-0026-push-options.sh | 2 ++ t/t5411/test-0027-push-options--porcelain.sh | 2 ++ t/t5411/test-0032-report-with-options.sh | 2 ++ ...test-0033-report-with-options--porcelain.sh | 2 ++ t/t5411/test-0038-report-mixed-refs.sh | 2 ++ .../test-0039-report-mixed-refs--porcelain.sh | 2 ++ 20 files changed, 84 insertions(+) diff --git a/t/t5411/test-0000-standard-git-push.sh b/t/t5411/test-0000-standard-git-push.sh index 47b058af7e..694d8e8dc2 100644 --- a/t/t5411/test-0000-standard-git-push.sh +++ b/t/t5411/test-0000-standard-git-push.sh @@ -40,6 +40,8 @@ test_expect_success "git-push --atomic ($PROTOCOL)" ' -e "/^To / { p; }" \ -e "/^ ! / { p; }" \ actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && To ! [rejected] main -> main (non-fast-forward) @@ -67,6 +69,8 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL)" ' $B:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next diff --git a/t/t5411/test-0001-standard-git-push--porcelain.sh b/t/t5411/test-0001-standard-git-push--porcelain.sh index bbead12bbb..6cf0bc7034 100644 --- a/t/t5411/test-0001-standard-git-push--porcelain.sh +++ b/t/t5411/test-0001-standard-git-push--porcelain.sh @@ -42,6 +42,8 @@ test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" ' -e "/^To / { p; }" \ -e "/^! / { p; }" \ actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && To ! refs/heads/main:refs/heads/main [rejected] (non-fast-forward) @@ -69,6 +71,8 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" ' $B:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next diff --git a/t/t5411/test-0002-pre-receive-declined.sh b/t/t5411/test-0002-pre-receive-declined.sh index e7d113a158..61c3ee1b7f 100644 --- a/t/t5411/test-0002-pre-receive-declined.sh +++ b/t/t5411/test-0002-pre-receive-declined.sh @@ -14,6 +14,8 @@ test_expect_success "git-push is declined ($PROTOCOL)" ' HEAD:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && To ! [remote rejected] -> main (pre-receive hook declined) diff --git a/t/t5411/test-0003-pre-receive-declined--porcelain.sh b/t/t5411/test-0003-pre-receive-declined--porcelain.sh index cc0cca6a47..0a9cc2d44a 100644 --- a/t/t5411/test-0003-pre-receive-declined--porcelain.sh +++ b/t/t5411/test-0003-pre-receive-declined--porcelain.sh @@ -14,6 +14,8 @@ test_expect_success "git-push is declined ($PROTOCOL/porcelain)" ' HEAD:refs/heads/next \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && To ! :refs/heads/main [remote rejected] (pre-receive hook declined) diff --git a/t/t5411/test-0011-no-hook-error.sh b/t/t5411/test-0011-no-hook-error.sh index c50830982f..fd2bd20b76 100644 --- a/t/t5411/test-0011-no-hook-error.sh +++ b/t/t5411/test-0011-no-hook-error.sh @@ -7,6 +7,8 @@ test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL) HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next @@ -43,6 +45,8 @@ test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCO HEAD:next \ HEAD:refs/for/main/topic >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/main diff --git a/t/t5411/test-0012-no-hook-error--porcelain.sh b/t/t5411/test-0012-no-hook-error--porcelain.sh index 14ea433481..025a9c7186 100644 --- a/t/t5411/test-0012-no-hook-error--porcelain.sh +++ b/t/t5411/test-0012-no-hook-error--porcelain.sh @@ -7,6 +7,8 @@ test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL/ HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next @@ -44,6 +46,8 @@ test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCO HEAD:next \ HEAD:refs/for/main/topic >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/main diff --git a/t/t5411/test-0013-bad-protocol.sh b/t/t5411/test-0013-bad-protocol.sh index b9be12be77..d20a4e6681 100644 --- a/t/t5411/test-0013-bad-protocol.sh +++ b/t/t5411/test-0013-bad-protocol.sh @@ -13,6 +13,8 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" ' HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && # Check status report for git-push sed -n \ @@ -67,6 +69,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTO test_cmp expect actual && grep "remote: fatal: die with the --die-read-version option" out && grep "remote: error: fail to negotiate version with proc-receive hook" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -101,6 +105,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROT test_cmp expect actual && grep "remote: fatal: die with the --die-write-version option" out && grep "remote: error: fail to negotiate version with proc-receive hook" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -134,6 +140,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROT EOF test_cmp expect actual && grep "remote: fatal: die with the --die-read-commands option" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -169,6 +177,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $ EOF test_cmp expect actual && grep "remote: fatal: die with the --die-read-push-options option" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -202,6 +212,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTO EOF test_cmp expect actual && grep "remote: fatal: die with the --die-write-report option" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -226,6 +238,8 @@ test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL)" ' HEAD:refs/heads/next \ HEAD:refs/for/main/topic >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next @@ -272,6 +286,8 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" ' HEAD:refs/for/main/topic\ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic @@ -308,6 +324,8 @@ test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" ' HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic diff --git a/t/t5411/test-0014-bad-protocol--porcelain.sh b/t/t5411/test-0014-bad-protocol--porcelain.sh index fdb4569109..a286030f3e 100644 --- a/t/t5411/test-0014-bad-protocol--porcelain.sh +++ b/t/t5411/test-0014-bad-protocol--porcelain.sh @@ -13,6 +13,8 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porc HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && # Check status report for git-push sed -n \ @@ -67,6 +69,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTO test_cmp expect actual && grep "remote: fatal: die with the --die-read-version option" out && grep "remote: error: fail to negotiate version with proc-receive hook" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -101,6 +105,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROT test_cmp expect actual && grep "remote: fatal: die with the --die-write-version option" out && grep "remote: error: fail to negotiate version with proc-receive hook" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -134,6 +140,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROT EOF test_cmp expect actual && grep "remote: fatal: die with the --die-read-commands option" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -169,6 +177,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $ EOF test_cmp expect actual && grep "remote: fatal: die with the --die-read-push-options option" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -202,6 +212,8 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTO EOF test_cmp expect actual && grep "remote: fatal: die with the --die-write-report option" out && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && git -C "$upstream" show-ref >out && make_user_friendly_and_stable_output actual && @@ -226,6 +238,8 @@ test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain) HEAD:refs/heads/next \ HEAD:refs/for/main/topic >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/next @@ -272,6 +286,8 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" ' HEAD:refs/for/main/topic\ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic @@ -309,6 +325,8 @@ test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porce HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic diff --git a/t/t5411/test-0020-report-ng.sh b/t/t5411/test-0020-report-ng.sh index 5a9e0daf2d..9f71da9fb6 100644 --- a/t/t5411/test-0020-report-ng.sh +++ b/t/t5411/test-0020-report-ng.sh @@ -14,6 +14,8 @@ test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" ' HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic @@ -48,6 +50,8 @@ test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL)" HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic diff --git a/t/t5411/test-0021-report-ng--porcelain.sh b/t/t5411/test-0021-report-ng--porcelain.sh index 93475a83cf..96065e3537 100644 --- a/t/t5411/test-0021-report-ng--porcelain.sh +++ b/t/t5411/test-0021-report-ng--porcelain.sh @@ -14,6 +14,8 @@ test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/por HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic @@ -49,6 +51,8 @@ test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL/p HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic diff --git a/t/t5411/test-0022-report-unexpect-ref.sh b/t/t5411/test-0022-report-unexpect-ref.sh index f8be8a0ba1..624dda7acc 100644 --- a/t/t5411/test-0022-report-unexpect-ref.sh +++ b/t/t5411/test-0022-report-unexpect-ref.sh @@ -15,6 +15,8 @@ test_expect_success "proc-receive: report unexpected ref ($PROTOCOL)" ' HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/main diff --git a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh index 778150fa03..dcb804afc8 100644 --- a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh +++ b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh @@ -15,6 +15,8 @@ test_expect_success "proc-receive: report unexpected ref ($PROTOCOL/porcelain)" HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/main diff --git a/t/t5411/test-0024-report-unknown-ref.sh b/t/t5411/test-0024-report-unknown-ref.sh index d4e74e4681..af65355862 100644 --- a/t/t5411/test-0024-report-unknown-ref.sh +++ b/t/t5411/test-0024-report-unknown-ref.sh @@ -14,6 +14,8 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" ' HEAD:refs/for/a/b/c/my/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/a/b/c/my/topic diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh index 039e8b6163..c336ec0e98 100644 --- a/t/t5411/test-0025-report-unknown-ref--porcelain.sh +++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh @@ -14,6 +14,8 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain HEAD:refs/for/a/b/c/my/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/a/b/c/my/topic diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh index e88edb16a4..46b1064fe6 100644 --- a/t/t5411/test-0026-push-options.sh +++ b/t/t5411/test-0026-push-options.sh @@ -18,6 +18,8 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL)" ' HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && test_i18ngrep "fatal: the receiving end does not support push options" \ actual && git -C "$upstream" show-ref >out && diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh index 3a6561b5ea..79a49a638e 100644 --- a/t/t5411/test-0027-push-options--porcelain.sh +++ b/t/t5411/test-0027-push-options--porcelain.sh @@ -19,6 +19,8 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && test_i18ngrep "fatal: the receiving end does not support push options" \ actual && git -C "$upstream" show-ref >out && diff --git a/t/t5411/test-0032-report-with-options.sh b/t/t5411/test-0032-report-with-options.sh index a0faf5c7ff..4d058cc6ff 100644 --- a/t/t5411/test-0032-report-with-options.sh +++ b/t/t5411/test-0032-report-with-options.sh @@ -15,6 +15,8 @@ test_expect_success "proc-receive: report option without matching ok ($PROTOCOL) HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic diff --git a/t/t5411/test-0033-report-with-options--porcelain.sh b/t/t5411/test-0033-report-with-options--porcelain.sh index 32ae26bcfb..8ab908a6b0 100644 --- a/t/t5411/test-0033-report-with-options--porcelain.sh +++ b/t/t5411/test-0033-report-with-options--porcelain.sh @@ -15,6 +15,8 @@ test_expect_success "proc-receive: report option without matching ok ($PROTOCOL/ HEAD:refs/for/main/topic \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/for/main/topic diff --git a/t/t5411/test-0038-report-mixed-refs.sh b/t/t5411/test-0038-report-mixed-refs.sh index 0d071ebaa6..264a5d5c6d 100644 --- a/t/t5411/test-0038-report-mixed-refs.sh +++ b/t/t5411/test-0038-report-mixed-refs.sh @@ -26,6 +26,8 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" ' HEAD:refs/for/next/topic3 \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/main diff --git a/t/t5411/test-0039-report-mixed-refs--porcelain.sh b/t/t5411/test-0039-report-mixed-refs--porcelain.sh index d8409912fd..1e9c06d2b7 100644 --- a/t/t5411/test-0039-report-mixed-refs--porcelain.sh +++ b/t/t5411/test-0039-report-mixed-refs--porcelain.sh @@ -26,6 +26,8 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL/porcel HEAD:refs/for/next/topic3 \ >out 2>&1 && make_user_friendly_and_stable_output actual && + # Prevent accidential changes by the internal "receive-pack" process. + rm out && cat >expect <<-EOF && remote: # pre-receive hook remote: pre-receive< refs/heads/main From patchwork Mon Jan 18 13:30:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 12027375 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0000C433DB for ; Mon, 18 Jan 2021 13:33:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60098221EB for ; Mon, 18 Jan 2021 13:33:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392221AbhARNcR (ORCPT ); Mon, 18 Jan 2021 08:32:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392329AbhARNbS (ORCPT ); Mon, 18 Jan 2021 08:31:18 -0500 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1A34C061574 for ; Mon, 18 Jan 2021 05:30:37 -0800 (PST) Received: by mail-pl1-x62b.google.com with SMTP id e9so4496033plh.3 for ; Mon, 18 Jan 2021 05:30:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9agrTWTHFmsUY1eE8dN68yYPhF/oWhWJZPc+ri76juc=; b=HxL8DIue8FQvkbcC4f11m94BGX54Zu5ZXLuapS1/7x5TprsoSXisFBY7z0jJtE1yWw 4272RxYjr3A04YmUDJibfkp7HhCD0lOB9X427QnlOAqIVTQvDiversQbtFAn4KQXMn5A cyJEZmhaw11kZZ20Dys0AYkVJmEOFUfom4zAEurIKGRq3J3EklY73qS8ZlSOvWbZDpzN ALWYm6e0T5lea64epwKLRqGWL1sIWxdwZmFehQkb5WynhMqy0Qgqkmx7m6mvUWV36CrK IylW8n+CML9ABOKpwYHnxWsJf/tSNohnYdslLZh3ub+5r8KN46laSu7q0RBTmXXhXQKa zYSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9agrTWTHFmsUY1eE8dN68yYPhF/oWhWJZPc+ri76juc=; b=g7yqfHpyKIRlC54hDOS+EYkGX9CSo/PUXI7IMD9yQeF8AOPXoRQ+bc9of4eD6r0Ztk hwpUvNNjq9VchjQ9jBe+iUJW/Q4QEqfB/JVsbqsmPIPKjTuQcBgQTrWHZe/C0IlEKrbf rP5PqDD5+nttTOUKVdOaVU2G+Izl8q7Mc3dWtR+xoS+6QFK3s+HbTl53g0ovMf50+V56 /Ht/ReKLcbWY6DR3FbTOSSZMY8qcsnkhMUFTOi3u1H3ujqOkZYGOAn8T+rn30Igqwt61 +eqMns4roW+s0YX+mp6ZkUrpq+UhMYk8l1tXES44PPp6qEAfNBjM+H5FjzN2dVpulex5 XTZg== X-Gm-Message-State: AOAM530IoRayhtQ693EqgzZpDdkGCT45Cy0SenavRdYS7j/mOdAXb/0E lJ/vALwW/81qVqqieMWH3YI= X-Google-Smtp-Source: ABdhPJxKxCjMH70Bwv36+M+DbV+Onc0cl/DhOznxth6yUWbobEyg4+kSTQgR4CuoqL6FoaMGcq7qyg== X-Received: by 2002:a17:90a:70ce:: with SMTP id a14mr13204986pjm.19.1610976636982; Mon, 18 Jan 2021 05:30:36 -0800 (PST) Received: from tigtog.localdomain.localdomain (144.34.163.219.16clouds.com. [144.34.163.219]) by smtp.gmail.com with ESMTPSA id m11sm3160010pjz.44.2021.01.18.05.30.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jan 2021 05:30:35 -0800 (PST) From: Jiang Xin To: Junio C Hamano , Git List , =?utf-8?q?SZEDER_G=C3=A1bor?= Cc: Jiang Xin Subject: [PATCH 2/2] t5411: refactor check of refs using test_cmp_refs Date: Mon, 18 Jan 2021 08:30:11 -0500 Message-Id: <20210118133011.15331-2-worldhello.net@gmail.com> X-Mailer: git-send-email 2.26.0.rc0 In-Reply-To: <20210117222151.GY8396@szeder.dev> References: <20210117222151.GY8396@szeder.dev> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jiang Xin Add new helper 'test_cmp_refs' to check references in a repository. Signed-off-by: Jiang Xin --- t/t5411/common-functions.sh | 15 +++++++ t/t5411/once-0010-report-status-v1.sh | 5 +-- t/t5411/test-0000-standard-git-push.sh | 24 ++++------ .../test-0001-standard-git-push--porcelain.sh | 24 ++++------ t/t5411/test-0002-pre-receive-declined.sh | 6 +-- ...st-0003-pre-receive-declined--porcelain.sh | 6 +-- t/t5411/test-0011-no-hook-error.sh | 12 ++--- t/t5411/test-0012-no-hook-error--porcelain.sh | 12 ++--- t/t5411/test-0013-bad-protocol.sh | 45 ++++--------------- t/t5411/test-0014-bad-protocol--porcelain.sh | 45 ++++--------------- t/t5411/test-0020-report-ng.sh | 12 ++--- t/t5411/test-0021-report-ng--porcelain.sh | 12 ++--- t/t5411/test-0022-report-unexpect-ref.sh | 6 +-- ...est-0023-report-unexpect-ref--porcelain.sh | 6 +-- t/t5411/test-0024-report-unknown-ref.sh | 6 +-- ...test-0025-report-unknown-ref--porcelain.sh | 6 +-- t/t5411/test-0026-push-options.sh | 18 +++----- t/t5411/test-0027-push-options--porcelain.sh | 18 +++----- t/t5411/test-0030-report-ok.sh | 6 +-- t/t5411/test-0031-report-ok--porcelain.sh | 6 +-- t/t5411/test-0032-report-with-options.sh | 5 +-- ...est-0033-report-with-options--porcelain.sh | 5 +-- t/t5411/test-0034-report-ft.sh | 6 +-- t/t5411/test-0035-report-ft--porcelain.sh | 6 +-- ...t-0036-report-multi-rewrite-for-one-ref.sh | 18 +++----- ...rt-multi-rewrite-for-one-ref--porcelain.sh | 18 +++----- t/t5411/test-0038-report-mixed-refs.sh | 6 +-- .../test-0039-report-mixed-refs--porcelain.sh | 6 +-- t/t5411/test-0040-process-all-refs.sh | 6 +-- .../test-0041-process-all-refs--porcelain.sh | 6 +-- ...t-0050-proc-receive-refs-with-modifiers.sh | 18 +++----- 31 files changed, 126 insertions(+), 264 deletions(-) diff --git a/t/t5411/common-functions.sh b/t/t5411/common-functions.sh index 344d13f61a..4835dd5182 100644 --- a/t/t5411/common-functions.sh +++ b/t/t5411/common-functions.sh @@ -59,3 +59,18 @@ filter_out_user_friendly_and_stable_output () { make_user_friendly_and_stable_output | sed -n ${1+"$@"} } + +test_cmp_refs () { + indir= + if test "$1" = "-C" + then + shift + indir="$1" + shift + fi + indir=${indir:+"$indir"/} + cat >show-ref.expect && + git ${indir:+ -C "$indir"} show-ref >show-ref.pristine && + make_user_friendly_and_stable_output show-ref.filtered && + test_cmp show-ref.expect show-ref.filtered +} diff --git a/t/t5411/once-0010-report-status-v1.sh b/t/t5411/once-0010-report-status-v1.sh index cb431a9c91..1233a46eac 100644 --- a/t/t5411/once-0010-report-status-v1.sh +++ b/t/t5411/once-0010-report-status-v1.sh @@ -83,12 +83,9 @@ test_expect_success "proc-receive: report status v1" ' EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/for/main/topic1 refs/heads/foo refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0000-standard-git-push.sh b/t/t5411/test-0000-standard-git-push.sh index 694d8e8dc2..7af6026749 100644 --- a/t/t5411/test-0000-standard-git-push.sh +++ b/t/t5411/test-0000-standard-git-push.sh @@ -19,13 +19,11 @@ test_expect_success "git-push ($PROTOCOL)" ' * [new branch] HEAD -> next EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(B) next(A) @@ -48,13 +46,11 @@ test_expect_success "git-push --atomic ($PROTOCOL)" ' ! [rejected] -> next (atomic push failed) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(B) next(A) @@ -81,13 +77,11 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL)" ' ! [rejected] main -> main (non-fast-forward) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(B) next(B) @@ -123,15 +117,13 @@ test_expect_success "git-push -f ($PROTOCOL)" ' * [new branch] HEAD -> a/b/c EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/a/b/c refs/heads/main refs/review/main/topic refs/tags/v123 EOF - test_cmp expect actual ' # Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A) diff --git a/t/t5411/test-0001-standard-git-push--porcelain.sh b/t/t5411/test-0001-standard-git-push--porcelain.sh index 6cf0bc7034..9e5c40f39c 100644 --- a/t/t5411/test-0001-standard-git-push--porcelain.sh +++ b/t/t5411/test-0001-standard-git-push--porcelain.sh @@ -20,13 +20,11 @@ test_expect_success "git-push ($PROTOCOL/porcelain)" ' Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(B) next(A) @@ -50,13 +48,11 @@ test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" ' ! :refs/heads/next [rejected] (atomic push failed) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(B) next(A) @@ -84,13 +80,11 @@ test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" ' Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(B) next(B) @@ -127,15 +121,13 @@ test_expect_success "git-push -f ($PROTOCOL/porcelain)" ' Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/a/b/c refs/heads/main refs/review/main/topic refs/tags/v123 EOF - test_cmp expect actual ' # Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A) diff --git a/t/t5411/test-0002-pre-receive-declined.sh b/t/t5411/test-0002-pre-receive-declined.sh index 61c3ee1b7f..7c70d45057 100644 --- a/t/t5411/test-0002-pre-receive-declined.sh +++ b/t/t5411/test-0002-pre-receive-declined.sh @@ -22,12 +22,10 @@ test_expect_success "git-push is declined ($PROTOCOL)" ' ! [remote rejected] HEAD -> next (pre-receive hook declined) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "cleanup ($PROTOCOL)" ' diff --git a/t/t5411/test-0003-pre-receive-declined--porcelain.sh b/t/t5411/test-0003-pre-receive-declined--porcelain.sh index 0a9cc2d44a..ea38248fc5 100644 --- a/t/t5411/test-0003-pre-receive-declined--porcelain.sh +++ b/t/t5411/test-0003-pre-receive-declined--porcelain.sh @@ -23,12 +23,10 @@ test_expect_success "git-push is declined ($PROTOCOL/porcelain)" ' Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "cleanup ($PROTOCOL/porcelain)" ' diff --git a/t/t5411/test-0011-no-hook-error.sh b/t/t5411/test-0011-no-hook-error.sh index fd2bd20b76..778b833f9d 100644 --- a/t/t5411/test-0011-no-hook-error.sh +++ b/t/t5411/test-0011-no-hook-error.sh @@ -21,13 +21,11 @@ test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL) ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(A) next(A) @@ -59,10 +57,8 @@ test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCO ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0012-no-hook-error--porcelain.sh b/t/t5411/test-0012-no-hook-error--porcelain.sh index 025a9c7186..371831d170 100644 --- a/t/t5411/test-0012-no-hook-error--porcelain.sh +++ b/t/t5411/test-0012-no-hook-error--porcelain.sh @@ -22,13 +22,11 @@ test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL/ Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(A) next(A) @@ -61,10 +59,8 @@ test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCO Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0013-bad-protocol.sh b/t/t5411/test-0013-bad-protocol.sh index d20a4e6681..43d37f4109 100644 --- a/t/t5411/test-0013-bad-protocol.sh +++ b/t/t5411/test-0013-bad-protocol.sh @@ -36,12 +36,9 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" ' EOF test_cmp expect actual-error && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL)" ' @@ -72,12 +69,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTO # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL)" ' @@ -108,12 +102,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROT # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL)" ' @@ -143,12 +134,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROT # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL)" ' @@ -180,12 +168,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $ # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL)" ' @@ -215,12 +200,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTO # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (no report, $PROTOCOL)" ' @@ -254,13 +236,10 @@ test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL)" ' EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(A) next(A) @@ -300,12 +279,9 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" ' EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL)" ' @@ -338,10 +314,7 @@ test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" ' EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0014-bad-protocol--porcelain.sh b/t/t5411/test-0014-bad-protocol--porcelain.sh index a286030f3e..c6299b4849 100644 --- a/t/t5411/test-0014-bad-protocol--porcelain.sh +++ b/t/t5411/test-0014-bad-protocol--porcelain.sh @@ -36,12 +36,9 @@ test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porc EOF test_cmp expect actual-error && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL/porcelain)" ' @@ -72,12 +69,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTO # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL/porcelain)" ' @@ -108,12 +102,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROT # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL/porcelain)" ' @@ -143,12 +134,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROT # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL/porcelain)" ' @@ -180,12 +168,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $ # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL/porcelain)" ' @@ -215,12 +200,9 @@ test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTO # Prevent accidential changes by the internal "receive-pack" process. rm out && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" ' @@ -255,13 +237,10 @@ test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(A) next(A) @@ -301,12 +280,9 @@ test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" ' EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelain)" ' @@ -340,10 +316,7 @@ test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porce EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0020-report-ng.sh b/t/t5411/test-0020-report-ng.sh index 9f71da9fb6..37300d374b 100644 --- a/t/t5411/test-0020-report-ng.sh +++ b/t/t5411/test-0020-report-ng.sh @@ -26,12 +26,10 @@ test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" ' ! [remote rejected] HEAD -> refs/for/main/topic (failed) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (ng message, $PROTOCOL)" ' @@ -62,10 +60,8 @@ test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL)" ! [remote rejected] HEAD -> refs/for/main/topic (error msg) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0021-report-ng--porcelain.sh b/t/t5411/test-0021-report-ng--porcelain.sh index 96065e3537..c40eb1060b 100644 --- a/t/t5411/test-0021-report-ng--porcelain.sh +++ b/t/t5411/test-0021-report-ng--porcelain.sh @@ -27,12 +27,10 @@ test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/por Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (ng message, $PROTOCOL/porcelain)" ' @@ -64,10 +62,8 @@ test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL/p Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0022-report-unexpect-ref.sh b/t/t5411/test-0022-report-unexpect-ref.sh index 624dda7acc..6c1716b25a 100644 --- a/t/t5411/test-0022-report-unexpect-ref.sh +++ b/t/t5411/test-0022-report-unexpect-ref.sh @@ -32,12 +32,10 @@ test_expect_success "proc-receive: report unexpected ref ($PROTOCOL)" ' ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' # Refs of upstream : main(B) diff --git a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh index dcb804afc8..46f44cdad5 100644 --- a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh +++ b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh @@ -33,12 +33,10 @@ test_expect_success "proc-receive: report unexpected ref ($PROTOCOL/porcelain)" Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' # Refs of upstream : main(B) diff --git a/t/t5411/test-0024-report-unknown-ref.sh b/t/t5411/test-0024-report-unknown-ref.sh index af65355862..a543c5acf7 100644 --- a/t/t5411/test-0024-report-unknown-ref.sh +++ b/t/t5411/test-0024-report-unknown-ref.sh @@ -27,10 +27,8 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" ' ! [remote rejected] HEAD -> refs/for/a/b/c/my/topic (proc-receive failed to report status) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh index c336ec0e98..972df50ca7 100644 --- a/t/t5411/test-0025-report-unknown-ref--porcelain.sh +++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh @@ -28,10 +28,8 @@ test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh index 46b1064fe6..049a474a0c 100644 --- a/t/t5411/test-0026-push-options.sh +++ b/t/t5411/test-0026-push-options.sh @@ -22,12 +22,10 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL)" ' rm out && test_i18ngrep "fatal: the receiving end does not support push options" \ actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "enable push options ($PROTOCOL)" ' @@ -71,13 +69,11 @@ test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL) * [new reference] HEAD -> refs/for/main/topic EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' test_expect_success "restore proc-receive hook ($PROTOCOL)" ' @@ -125,13 +121,11 @@ test_expect_success "proc-receive: push with options ($PROTOCOL)" ' * [new reference] HEAD -> refs/for/main/topic EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(A) next(A) diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh index 79a49a638e..e0455b8b81 100644 --- a/t/t5411/test-0027-push-options--porcelain.sh +++ b/t/t5411/test-0027-push-options--porcelain.sh @@ -23,12 +23,10 @@ test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain rm out && test_i18ngrep "fatal: the receiving end does not support push options" \ actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "enable push options ($PROTOCOL/porcelain)" ' @@ -74,13 +72,11 @@ test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL/ Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' test_expect_success "restore proc-receive hook ($PROTOCOL/porcelain)" ' @@ -130,13 +126,11 @@ test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" ' Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/next EOF - test_cmp expect actual ' # Refs of upstream : main(A) next(A) diff --git a/t/t5411/test-0030-report-ok.sh b/t/t5411/test-0030-report-ok.sh index 5d6feef118..8acb4f204f 100644 --- a/t/t5411/test-0030-report-ok.sh +++ b/t/t5411/test-0030-report-ok.sh @@ -26,10 +26,8 @@ test_expect_success "proc-receive: ok ($PROTOCOL)" ' * [new reference] HEAD -> refs/for/main/topic EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0031-report-ok--porcelain.sh b/t/t5411/test-0031-report-ok--porcelain.sh index 91666d32df..a967718046 100644 --- a/t/t5411/test-0031-report-ok--porcelain.sh +++ b/t/t5411/test-0031-report-ok--porcelain.sh @@ -27,10 +27,8 @@ test_expect_success "proc-receive: ok ($PROTOCOL/porcelain)" ' Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0032-report-with-options.sh b/t/t5411/test-0032-report-with-options.sh index 4d058cc6ff..9711d69f1d 100644 --- a/t/t5411/test-0032-report-with-options.sh +++ b/t/t5411/test-0032-report-with-options.sh @@ -249,10 +249,7 @@ test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL)" ' EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0033-report-with-options--porcelain.sh b/t/t5411/test-0033-report-with-options--porcelain.sh index 8ab908a6b0..7e699e8088 100644 --- a/t/t5411/test-0033-report-with-options--porcelain.sh +++ b/t/t5411/test-0033-report-with-options--porcelain.sh @@ -258,10 +258,7 @@ test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL/porc EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0034-report-ft.sh b/t/t5411/test-0034-report-ft.sh index c355c290d2..6e0d08b327 100644 --- a/t/t5411/test-0034-report-ft.sh +++ b/t/t5411/test-0034-report-ft.sh @@ -28,13 +28,11 @@ test_expect_success "proc-receive: fall throught, let receive-pack to execute ($ * [new reference] -> refs/for/main/topic EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/for/main/topic refs/heads/main EOF - test_cmp expect actual ' # Refs of upstream : main(A) refs/for/main/topic(A) diff --git a/t/t5411/test-0035-report-ft--porcelain.sh b/t/t5411/test-0035-report-ft--porcelain.sh index 8ce4e58f2a..81bae9f2ec 100644 --- a/t/t5411/test-0035-report-ft--porcelain.sh +++ b/t/t5411/test-0035-report-ft--porcelain.sh @@ -29,13 +29,11 @@ test_expect_success "proc-receive: fall throught, let receive-pack to execute ($ Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/for/main/topic refs/heads/main EOF - test_cmp expect actual ' # Refs of upstream : main(A) refs/for/main/topic(A) diff --git a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh index fad8eea8a0..be9b18b2b6 100644 --- a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh +++ b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh @@ -65,12 +65,10 @@ test_expect_success "proc-receive: multiple rewrite for one ref, no refname for .. HEAD -> refs/changes/25/125/1 EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "proc-receive: check remote-tracking #1 ($PROTOCOL)" ' @@ -142,12 +140,10 @@ test_expect_success "proc-receive: multiple rewrites for one ref, no refname for + ... HEAD -> refs/changes/25/125/1 (forced update) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "proc-receive: check remote-tracking #2 ($PROTOCOL)" ' @@ -205,12 +201,10 @@ test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL)" ' .. HEAD -> refs/changes/24/124/2 EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "proc-receive: check remote-tracking #3 ($PROTOCOL)" ' diff --git a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh index dc254d57eb..95fb89c031 100644 --- a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh +++ b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh @@ -51,12 +51,10 @@ test_expect_success "proc-receive: multiple rewrite for one ref, no refname for Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL/porcelain)" ' @@ -114,12 +112,10 @@ test_expect_success "proc-receive: multiple rewrites for one ref, no refname for Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL/porcelain)" ' @@ -163,10 +159,8 @@ test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL/porc Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' diff --git a/t/t5411/test-0038-report-mixed-refs.sh b/t/t5411/test-0038-report-mixed-refs.sh index 264a5d5c6d..88fa60e53c 100644 --- a/t/t5411/test-0038-report-mixed-refs.sh +++ b/t/t5411/test-0038-report-mixed-refs.sh @@ -67,15 +67,13 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" ' ! [remote rejected] HEAD -> refs/for/next/topic3 (proc-receive failed to report status) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/bar refs/heads/baz refs/heads/foo refs/heads/main EOF - test_cmp expect actual ' # Refs of upstream : main(B) foo(A) bar(A)) baz(A) diff --git a/t/t5411/test-0039-report-mixed-refs--porcelain.sh b/t/t5411/test-0039-report-mixed-refs--porcelain.sh index 1e9c06d2b7..6c36d9250f 100644 --- a/t/t5411/test-0039-report-mixed-refs--porcelain.sh +++ b/t/t5411/test-0039-report-mixed-refs--porcelain.sh @@ -68,15 +68,13 @@ test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL/porcel Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/bar refs/heads/baz refs/heads/foo refs/heads/main EOF - test_cmp expect actual ' # Refs of upstream : main(B) foo(A) bar(A)) baz(A) diff --git a/t/t5411/test-0040-process-all-refs.sh b/t/t5411/test-0040-process-all-refs.sh index 2565302a17..fdcdcc7c2e 100644 --- a/t/t5411/test-0040-process-all-refs.sh +++ b/t/t5411/test-0040-process-all-refs.sh @@ -92,14 +92,12 @@ test_expect_success "proc-receive: process all refs ($PROTOCOL)" ' + ... HEAD -> refs/pull/124/head (forced update) EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/bar refs/heads/baz refs/heads/main EOF - test_cmp expect actual ' # Refs of upstream : main(A) bar(A) baz(B) diff --git a/t/t5411/test-0041-process-all-refs--porcelain.sh b/t/t5411/test-0041-process-all-refs--porcelain.sh index e21420b60d..73b35fe0aa 100644 --- a/t/t5411/test-0041-process-all-refs--porcelain.sh +++ b/t/t5411/test-0041-process-all-refs--porcelain.sh @@ -93,14 +93,12 @@ test_expect_success "proc-receive: process all refs ($PROTOCOL/porcelain)" ' Done EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/bar refs/heads/baz refs/heads/main EOF - test_cmp expect actual ' # Refs of upstream : main(A) bar(A) baz(B) diff --git a/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh index 2e29518ec5..7214647ada 100644 --- a/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh +++ b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh @@ -50,12 +50,10 @@ test_expect_success "proc-receive: update branch and new tag ($PROTOCOL)" ' * [new reference] v123 -> refs/pull/124/head EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main EOF - test_cmp expect actual ' # Refs of upstream : main(A) @@ -63,14 +61,12 @@ test_expect_success "proc-receive: update branch and new tag ($PROTOCOL)" ' test_expect_success "setup upstream: create tags/v123 ($PROTOCOL)" ' git -C "$upstream" update-ref refs/heads/topic $A && git -C "$upstream" update-ref refs/tags/v123 $TAG && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/topic refs/tags/v123 EOF - test_cmp expect actual ' test_expect_success "setup proc-receive hook ($PROTOCOL)" ' @@ -125,11 +121,9 @@ test_expect_success "proc-receive: create/delete branch, and delete tag ($PROTOC * [new reference] -> refs/pull/124/head EOF test_cmp expect actual && - git -C "$upstream" show-ref >out && - make_user_friendly_and_stable_output actual && - cat >expect <<-EOF && + + test_cmp_refs -C "$upstream" <<-EOF refs/heads/main refs/heads/topic EOF - test_cmp expect actual '