From patchwork Wed Dec 22 10:59:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12691375 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F07E5C433F5 for ; Wed, 22 Dec 2021 10:59:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244339AbhLVK7u (ORCPT ); Wed, 22 Dec 2021 05:59:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240152AbhLVK7s (ORCPT ); Wed, 22 Dec 2021 05:59:48 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AD80C06173F for ; Wed, 22 Dec 2021 02:59:48 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id n14-20020a7bcbce000000b00332f4abf43fso2140921wmi.0 for ; Wed, 22 Dec 2021 02:59:48 -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=tvFZ9qZCejLyG7oTZeRyM1U9KFhGJEvGDTF6g7N48ko=; b=LwgkYUavHT5vCqQdVyYtUHxPNJtj60PqHd0IAeP3JLX3VnejST2Jp6WjqihOMgVd8n z7Swttoj9616KfJbDXa9xrwKIoFjgtOF+Q8xqNzQltaCWv3Tsv3EBCK4JLSIkZmL/4C9 kUJ56NsJrvyNhHZXokVBAOHkvKIl/2oPplJ809G1IEyX9xBpM9SohoqMfianZznoPStk TSdavfE2GxP5ur/THKJL5JDQkS3rGvEL/ZFw9XJbRAbh20itlo7LBAdoCjVJXNMKx64l vrQwkWb4SQ7vQi5qvQxYX3lzgofyGvAxQebNrWCRQLWmoC7PLDj/cKWE8PDFvGCMogER b/aA== 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=tvFZ9qZCejLyG7oTZeRyM1U9KFhGJEvGDTF6g7N48ko=; b=keG5rLrFB52z2BGmSRkRXp3ZMYxz/9/M4SSWGX7yNclTPPI8S/wmsx8ZLxEPO0YOGr xbSelZhlLcSpQRYoeD+C05Y9NqkMbUmATiZgPHvzy+OiMrTtRastl7vRYOJqvXhO5tbc rnwxSN83Ln5b6wEIS3LNbw3wRsSAhNQPmXOjHvIEGbCBPewQtCdZtIoUFyqELudIuaHB r4F9wYIhEbsAHWi8lM2GSXMmWdSDkd1LHsfJvoQsPBCkAfFc1Vkty9XHRjDxXaxrRRq/ Au3nhw2ZZ3ZCy1DmuqTEu4jK9NhQggaX/EbrQwqHoZQf2oukaf9hBaLU3W1yi9rjeXwf EbuA== X-Gm-Message-State: AOAM53334/2FA+Nm3yyrckEtgFUIMfo/sAOTJQ1ulvLVlgRFKXgDbcsj VBnZGV1gG6/2otrsd0OAtOY7T7lPdEE= X-Google-Smtp-Source: ABdhPJzUMGGy2sjYRxXgGgCePSDhcOzmZohGgomBgmvMPC3eUuMK6t2xVF5kRpisxequczCzWj/UjA== X-Received: by 2002:a1c:1dd0:: with SMTP id d199mr550426wmd.150.1640170786595; Wed, 22 Dec 2021 02:59:46 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c8sm1615451wrp.40.2021.12.22.02.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 02:59:46 -0800 (PST) Message-Id: In-Reply-To: References: Date: Wed, 22 Dec 2021 10:59:41 +0000 Subject: [PATCH 1/4] t5540: require REFFILES Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys The dumb HTTP protocol exposes ref storage details as part of the protocol, so it only works with the FILES refstorage backend Signed-off-by: Han-Wen Nienhuys --- t/t5540-http-push-webdav.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/t/t5540-http-push-webdav.sh b/t/t5540-http-push-webdav.sh index 8b68bb38a44..b0dbacf0b9b 100755 --- a/t/t5540-http-push-webdav.sh +++ b/t/t5540-http-push-webdav.sh @@ -18,6 +18,12 @@ then test_done fi +if test_have_prereq !REFFILES +then + skip_all='skipping test; dumb HTTP protocol not supported with reftable.' + test_done +fi + LIB_HTTPD_DAV=t . "$TEST_DIRECTORY"/lib-httpd.sh ROOT_PATH="$PWD" From patchwork Wed Dec 22 10:59:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12691377 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B0D7C433EF for ; Wed, 22 Dec 2021 10:59:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244342AbhLVK7v (ORCPT ); Wed, 22 Dec 2021 05:59:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244336AbhLVK7t (ORCPT ); Wed, 22 Dec 2021 05:59:49 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6176C061574 for ; Wed, 22 Dec 2021 02:59:48 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id d9so4183924wrb.0 for ; Wed, 22 Dec 2021 02:59:48 -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=rato+b+gDDJp4bZBDwPOPwpDF5sfClgs0nUjNmKWOsg=; b=JHQe2NVMM4TftPxg4f1gOKSzi44VjT4qFHL+3ZT9heFtcT8boI+bfV28BVNLputUht 9w4qxbJVX3OXyvzYfyQprKJZy50CeE+iw9JWgVFH2Rx9a+pgM+KbOGpzoZZxvCyBx7I0 SBc9t4arV+SqdOZI1g3UIiTsr2atX9JoxshdhzqMCngpLSj65K6Rg62q3014MYeRM07J 5svoRjYUZrGpKIyNpGsNdbajcRv48TKFU1QDw9/usvM+jMyPvSxiFpLKaq7kFz6nXbPb Ei2UOIroPy2eZ2VirHUHiZSpYY1HbDx9576MLsI8EEggbZQEErIYJQUNKYKyNhZo768N MmLg== 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=rato+b+gDDJp4bZBDwPOPwpDF5sfClgs0nUjNmKWOsg=; b=IuiTVQj9+NTPAfFnuq9h5XUqUqHLcgrMKeRKoyKlNTpt8xP+9rQ7MmLvEYrL0Uu19Z JR83yLUlLlHZtb4/SAgm7h41QHzkh37PnkI06L1Fn07VehSp0Q2Ywn0wKkNXdRgIFP+1 tEHfhT8Y+5AmU64BW/uZyipThOpELoqa4Cj2TrO1K38GoGNNEFjeGNWaLIMCzYYFM6K9 SqF6oDQZiYfHcAL7vYw+WaOl/IDjFBbeUTJQ9NiQTjLSSi6ClImYXHDx0uiPNi/OfSDG Ax9knS/IXx9+echlKNXwN6nXnfkiGNH347gLAm+3HRlRd7yz2AmsifUhjaCPwY4D+Kla 8sRQ== X-Gm-Message-State: AOAM5320noWSiEWSWPQWdVr0bGkX6mvziacsDVBGIeUMTA4lFiTiG3ac 7x2Z7gqnMrEP49HUkGUB5txNsH5nIhQ= X-Google-Smtp-Source: ABdhPJwmSMVekkAofX86BD+KTlbGs5Tr+HSCqt5b6VfyQxhQKcbn+Hnu3ylrB/VrvX07u4whfGKZrg== X-Received: by 2002:adf:8b0e:: with SMTP id n14mr1716753wra.281.1640170787416; Wed, 22 Dec 2021 02:59:47 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m21sm1551682wrb.2.2021.12.22.02.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 02:59:47 -0800 (PST) Message-Id: <36758f8cda3da4a53cbdff3af2eac3a60aadd692.1640170784.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 22 Dec 2021 10:59:42 +0000 Subject: [PATCH 2/4] t5550: require REFFILES Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys The dumb HTTP protocol exposes ref storage details as part of the protocol, so it only works with the FILES refstorage backend Signed-off-by: Han-Wen Nienhuys --- t/t5550-http-fetch-dumb.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh index 6d9142afc3b..259203926a9 100755 --- a/t/t5550-http-fetch-dumb.sh +++ b/t/t5550-http-fetch-dumb.sh @@ -5,6 +5,13 @@ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh + +if test_have_prereq !REFFILES +then + skip_all='skipping test; dumb HTTP protocol not supported with reftable.' + test_done +fi + . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd From patchwork Wed Dec 22 10:59:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12691379 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 552F7C433FE for ; Wed, 22 Dec 2021 10:59:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244344AbhLVK7x (ORCPT ); Wed, 22 Dec 2021 05:59:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244337AbhLVK7u (ORCPT ); Wed, 22 Dec 2021 05:59:50 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CB68C06173F for ; Wed, 22 Dec 2021 02:59:49 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id f134-20020a1c1f8c000000b00345c05bc12dso1231046wmf.3 for ; Wed, 22 Dec 2021 02:59:49 -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=B2tMnh8d8ih9qHUp1SrO+05Dkn2J4Ex9VrM70kwBxTQ=; b=DQmt3EDxZ00ERdpQ7YQkAs/k9loH7zdcxdRYazuQ74Q295j53HFAJ6pDfWOgMBzqsS DA234T45Ss+3f1Q62AJY1AHBwtfIBEtswgmVqDVICBzNzTSdTF2nuWh67BL/8jid6MCb OEH8OoLoqQOt22BnaTYW1DJnFiqiJFhHS/6aJUj28AGWqICNT1RKS8EeO4lIgNe3ZjGP If+1IZ81deReeX72VEF5OLDv2W6Q0IToGNJ6l+DuHDDshGAL8iYPrFlZQwVP3Ipqlwu6 OaYBM6ymqIs0VZZwr3CRa9FvgSsT7nuYuE16meOUnzBReyO8oNbFhFYdm7dkcA15BmWq zylg== 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=B2tMnh8d8ih9qHUp1SrO+05Dkn2J4Ex9VrM70kwBxTQ=; b=YZOQT0mO4+uuUNrft0/6x9InD7962/9YwRF83dlV3pMN1M+GxkgldnxhAv77VzrUFm lO7byyRgM2dsC0DsvBfWJSzDvMLjvO5YwtCKLxvXBbzeu18Sa0A5pH/8xwUHFgk2ZNfV UUamqWRnodthNeGSzxAPKbZO96bmuCfsshHA2mLQNEUfs4G/M1BCe4PghO/7Aj6jkwPL aMn1L7qSJp8wu+D3hDRT4LkOp8o0r7FFsC0p6zYSDzLCbYHHwX0B+873+FIaPFtpolCa 8qOg4nHS/GD2hlHzOKeVJm0GFahWiszCTyRiG69NGjyG1Ecpti6uxYGh/ce4UyoThtAf 7d2g== X-Gm-Message-State: AOAM532HvXaSMJIOGFtgmpxz/CugNVI2CdobKjGx54CAARnyLNp9vlDG pydsQ8pyNmJ1uAO3kC56rfxqzNPya8A= X-Google-Smtp-Source: ABdhPJz4k9PUHjXvqF39xr13/gIiAqk8mwCrb7MCvYiOxnb0VHNEcR36eHJXfgmqM5eartotnNzS0g== X-Received: by 2002:a05:600c:3844:: with SMTP id s4mr544493wmr.124.1640170788029; Wed, 22 Dec 2021 02:59:48 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s189sm5820693wme.0.2021.12.22.02.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 02:59:47 -0800 (PST) Message-Id: <854bd15787618978b2da3941b5b749dadc1a186f.1640170784.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 22 Dec 2021 10:59:43 +0000 Subject: [PATCH 3/4] t7004: create separate tags for different tests Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys Reftable intentionally keeps reflog data for deleted refs. This breaks tests that delete and recreate "refs/tags/tag_with_reflog" as traces of the deletion are left in reflog. To resolve this, use a differently named ref for each test case. Signed-off-by: Han-Wen Nienhuys --- t/t7004-tag.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 082be85dffc..301d1190482 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -94,10 +94,10 @@ test_expect_success 'creating a tag with --create-reflog should create reflog' ' git log -1 \ --format="format:tag: tagging %h (%s, %cd)%n" \ --date=format:%Y-%m-%d >expected && - test_when_finished "git tag -d tag_with_reflog" && - git tag --create-reflog tag_with_reflog && - git reflog exists refs/tags/tag_with_reflog && - sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual && + test_when_finished "git tag -d tag_with_reflog1" && + git tag --create-reflog tag_with_reflog1 && + git reflog exists refs/tags/tag_with_reflog1 && + sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog1 >actual && test_cmp expected actual ' @@ -105,10 +105,10 @@ test_expect_success 'annotated tag with --create-reflog has correct message' ' git log -1 \ --format="format:tag: tagging %h (%s, %cd)%n" \ --date=format:%Y-%m-%d >expected && - test_when_finished "git tag -d tag_with_reflog" && - git tag -m "annotated tag" --create-reflog tag_with_reflog && - git reflog exists refs/tags/tag_with_reflog && - sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual && + test_when_finished "git tag -d tag_with_reflog2" && + git tag -m "annotated tag" --create-reflog tag_with_reflog2 && + git reflog exists refs/tags/tag_with_reflog2 && + sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog2 >actual && test_cmp expected actual ' @@ -118,10 +118,10 @@ test_expect_success '--create-reflog does not create reflog on failure' ' ' test_expect_success 'option core.logAllRefUpdates=always creates reflog' ' - test_when_finished "git tag -d tag_with_reflog" && + test_when_finished "git tag -d tag_with_reflog3" && test_config core.logAllRefUpdates always && - git tag tag_with_reflog && - git reflog exists refs/tags/tag_with_reflog + git tag tag_with_reflog3 && + git reflog exists refs/tags/tag_with_reflog3 ' test_expect_success 'listing all tags if one exists should succeed' ' From patchwork Wed Dec 22 10:59:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han-Wen Nienhuys X-Patchwork-Id: 12691381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C1C2C433F5 for ; Wed, 22 Dec 2021 10:59:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244345AbhLVK7z (ORCPT ); Wed, 22 Dec 2021 05:59:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244340AbhLVK7u (ORCPT ); Wed, 22 Dec 2021 05:59:50 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44964C061401 for ; Wed, 22 Dec 2021 02:59:50 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id s1so4066515wra.6 for ; Wed, 22 Dec 2021 02:59:50 -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=kbyye6oOYDb03kAxg8U9TW1QQ3JEa1Eciuhp/1BZTSg=; b=MoiukF6q3UpI1ClQxk3mISZG7RqgAG4PJL6+bfpNOgcqrKHm0slS0iPF9ET0zjZWB1 FAJvp8/XF4hBp/ME5VLuMyrth5IV9SAhyoGeoXOMRpBsizSFhn2gqy/UtHVoD3vxKegq iwdRS0xX1Zw40wvkVP2Q+ZUWeC7tM/VAN06rnSOXdAze2DEMTJ5Z3GCrN5CU+jFRKDsk ZZr/1zTH2+Fq8RP9Jxy+fWiMdafeHEuxeh7sjW2mv9zUwBwn9byVVkyo/6GDm5cQjRnq YhPxRbNoHFRjgeBbS+hfhmTrBY5eXH7N9z4BLXzgSWFJueZW8PXn5RqN1sLhkbuDYLc5 /7XA== 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=kbyye6oOYDb03kAxg8U9TW1QQ3JEa1Eciuhp/1BZTSg=; b=5ax/Z4XV+qBDUmJ248OxYKkrIcdTGR79cIBtN0qleA4Lt6L650E+XhqWLz8XK0HWHF /FaDuermJYZRz2DSsOcqW7PNqy72jPvepblWsY0/9sgz8OYd2+BZEFa+8jtpBw9rdR2N QaJRR4euiriS2s3cIKo3s3cCViFTbvs5LQpWjljcCYxuj9ES8v9cexFRhgKXjqshbWCH iTA+USACM02LOrVLakXllKWISeW+koQJNYMja0meBXBuoJjLjXxFIUUshISgOdy1eDaS N1t6eNtpoMPK6iHDi3Zy5MjEyPMvLMeo6to7dc4NJ1mrVsGj3CSB0HstELJcWgu3387E Qeog== X-Gm-Message-State: AOAM533K7ghmLD5/Q2VA7uhU+irVts6pqdBvLbQgAsefbUkUiBc9bGe3 +ww4NY293XAZ48algzRzLwqAD21F5TQ= X-Google-Smtp-Source: ABdhPJx4SQA9Z/8okn7p2m9yVUjGBw5qBqqKsAaPxSlLhnt5j1ZR5nreeUIDIPCUhqBLd3ZIZRuCsw== X-Received: by 2002:adf:cd8a:: with SMTP id q10mr1736831wrj.164.1640170788736; Wed, 22 Dec 2021 02:59:48 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r62sm1421008wmr.35.2021.12.22.02.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 02:59:48 -0800 (PST) Message-Id: <5d693273e5852ae9b302cb79e8dd986b6ffa10da.1640170784.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 22 Dec 2021 10:59:44 +0000 Subject: [PATCH 4/4] t7004: use "test-tool ref-store" for reflog inspection Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Han-Wen Nienhuys Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Han-Wen Nienhuys From: Han-Wen Nienhuys This makes the test work with reftable. Signed-off-by: Han-Wen Nienhuys --- t/t7004-tag.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 301d1190482..bc8a221b2c7 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -97,7 +97,7 @@ test_expect_success 'creating a tag with --create-reflog should create reflog' ' test_when_finished "git tag -d tag_with_reflog1" && git tag --create-reflog tag_with_reflog1 && git reflog exists refs/tags/tag_with_reflog1 && - sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog1 >actual && + test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog1 | sed -e "s/^.* //" >actual && test_cmp expected actual ' @@ -108,7 +108,7 @@ test_expect_success 'annotated tag with --create-reflog has correct message' ' test_when_finished "git tag -d tag_with_reflog2" && git tag -m "annotated tag" --create-reflog tag_with_reflog2 && git reflog exists refs/tags/tag_with_reflog2 && - sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog2 >actual && + test-tool ref-store main for-each-reflog-ent refs/tags/tag_with_reflog2 | sed -e "s/^.* //" >actual && test_cmp expected actual '