From patchwork Mon Jul 19 18:07:25 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: 12386447 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=-12.7 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 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 33AAEC12002 for ; Mon, 19 Jul 2021 18:11:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 169DE61164 for ; Mon, 19 Jul 2021 18:11:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353515AbhGSRbF (ORCPT ); Mon, 19 Jul 2021 13:31:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380073AbhGSR1g (ORCPT ); Mon, 19 Jul 2021 13:27:36 -0400 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 D6006C0617AA for ; Mon, 19 Jul 2021 10:52:06 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id f17so23146038wrt.6 for ; Mon, 19 Jul 2021 11:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=+LQv9W/8FyW4BLvhS//TTXSTF5vhzAh80O5f8juX6TU=; b=U2dE9T6heeARFGBebVXIrwRAh7r8kEUp38rDGUXAwTJ1QPCQKisny4Ns7qqlBTYenU u6hvf3tcJZyi8fp0RBxX+sWV1zP4U1N9X/pgCcsAWQIzVVhbI4TbzKR/kRfcTYA8sPzj gdnthQFWfHHWa6DxpTJXb/WMrqUrPmUGG4ps48RZaDL7Rax3Ty//k+ynlxqp1bFYRWOc g6+u6h59ly6jwI3W9PO8GAot2ceE/Ptd1LBS0TL/A6MUnmryprm1OIsaPkNGuBStbJLw vOIo0RyJEmYJPxmiKPARpp5OXieG5Yl2KCvEt8EaqhcszLwz2GVwWYIwLCiSo1z4drEP 0A6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=+LQv9W/8FyW4BLvhS//TTXSTF5vhzAh80O5f8juX6TU=; b=qLi/FNXZZVwlovtSR4C3iTUH+iYIjcGEvwN8xcmI0nG3Q61/MZ+oQLHOxAF/n3SZ2G dmQQqY8eLKuNeKb1scYNJ39HzlWYB6tLtaWPQtK7Rjkf0ViNdAGyDaNHZSMy0AHNnVmn dY31Jafz6bfsQBhDLZYWU3DpjhjBEmUhdjMUsWfpy6qa7EetV98v+Uxf+StXwtWLFE26 vEHxjC3oQA1JfIUYupY4yjqjFMtF1fOJUELEhAvLT9SoCDBfQ7fP4yJyQIqsQXxIWTtn +HmpcGRAr5T/d2wBqMlsUcCwn9dnclEs3c9ERx4uvJbkvJwoSldCEBwoGjy/fFCTINtA jn+A== X-Gm-Message-State: AOAM533niNLoE2D+YEKvH7no7KpAionaMYj6wmAWD266bTz8SuGZyfi+ 994Tx/114ox85WyOBGIe3XIFvAveGP8= X-Google-Smtp-Source: ABdhPJx568p0XO/MKLo3FRl4WZsEAjbQhbhAy8kv3VSaRh/tpIFV0+1I1f3ekG9u/rkoDBOJIOhwQw== X-Received: by 2002:a5d:6a4d:: with SMTP id t13mr31037554wrw.412.1626718052191; Mon, 19 Jul 2021 11:07:32 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q7sm17600423wmq.33.2021.07.19.11.07.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 11:07:31 -0700 (PDT) Message-Id: <61a5c3718dfbba7aae6aee75b3030d7d744d2664.1626718050.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Jul 2021 18:07:25 +0000 Subject: [PATCH 1/6] t6050: use git-update-ref rather than filesystem access 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 Signed-off-by: Han-Wen Nienhuys --- t/t6050-replace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh index e33d512ec11..2500acc2ef8 100755 --- a/t/t6050-replace.sh +++ b/t/t6050-replace.sh @@ -132,7 +132,7 @@ tagger T A Gger <> 0 +0000 EOF test_expect_success 'tag replaced commit' ' - git mktag .git/refs/tags/mytag + git update-ref refs/tags/mytag $(git mktag X-Patchwork-Id: 12386449 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=-12.7 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 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 1EFE6C07E95 for ; Mon, 19 Jul 2021 18:11:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A92E610FB for ; Mon, 19 Jul 2021 18:11:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355922AbhGSRbJ (ORCPT ); Mon, 19 Jul 2021 13:31:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380086AbhGSR1h (ORCPT ); Mon, 19 Jul 2021 13:27:37 -0400 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 75F1BC061574 for ; Mon, 19 Jul 2021 10:52:07 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id g16so23136763wrw.5 for ; Mon, 19 Jul 2021 11:07:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=dkjFbKCqgkmzb3ALYM/j8lsueduBg9xjD6SXKLT3gIk=; b=aujQiGeCHEZrVzOOMPf572szVglVTAckByFeoDj7Q+F5via1fAqyBLwcG2R/HzBavP YDygIp4zSTCpRzMtRYornrpMS82z+4FuifpCu5wQg/3MlZgTqdrFXx+HVb7U/Cbekunz OblLy31Um5xGgkIjV852Icu6fN5baXLSG1YnninboVpr+Rr8MbfGnjvdyQOF4pilCWbS Nk+E1ewh1LgwJiK+n+yJcOgPK+F1aAiMFWYypl/d623f24thG5MQLtDqGRIt2aylWnmB OQG4lH5q3Lm7lYXy/AcmLVpZzpSaV5gPzGDnAVxdQP3xmPy6AEtoDq7pIaucfhD74cRw g+vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=dkjFbKCqgkmzb3ALYM/j8lsueduBg9xjD6SXKLT3gIk=; b=PJp0HhmZYROdpNYa8JilI4RK0n4+eMUGjh3jEqBP0Hn/tTywIa3KYMjcsFqwH3rDtt Tz3w5FmBW/IzY+eAc8bH5BMTe0x42EpdNlL4ZiSqPUiNwZvlNe142MFozqB1VlETu6Sx c6Nnq/xmf+9OvQV2rEYzdyKXLOfbekHfcsglz/Qrk9J1IW9AinqNJ+a6+9tQA8Q7gA3E 3w5K0K7AYfDMTA4fAdb7AD49UiRz5CesfuqHSVzoS6LC5JNWeI4SB0kccDXfh+vJwY+C b9Oe7ry/TBV1Ol2LjBpbkYh01lmHVFqflbSlfsEKZW61TEJ478VhhY2hsVbpyuAArhSo 4ACA== X-Gm-Message-State: AOAM530nElc6jMnZeVbEpFmjXSl1WjA4bcv5i5BHpCPcmUoSqHFWyuAc RNHIa1yIAFVaTHxE23zoF5TLhQI0ziY= X-Google-Smtp-Source: ABdhPJyjiKj2wOZYrg9DhPNsGm8ujcZnf3N7lkPZK70Bd0ucgX+Lls9JeDBitVG98VIN4vCJOXrLIA== X-Received: by 2002:adf:ee05:: with SMTP id y5mr25162840wrn.235.1626718052729; Mon, 19 Jul 2021 11:07:32 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 140sm17603539wmb.43.2021.07.19.11.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 11:07:32 -0700 (PDT) Message-Id: <49994a0d154abd3e4cc7d8cf64044b8ab738819f.1626718050.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Jul 2021 18:07:26 +0000 Subject: [PATCH 2/6] t1503: mark symlink test as 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 Signed-off-by: Han-Wen Nienhuys --- t/t1503-rev-parse-verify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh index bf081023917..40958615ebb 100755 --- a/t/t1503-rev-parse-verify.sh +++ b/t/t1503-rev-parse-verify.sh @@ -142,7 +142,7 @@ test_expect_success 'main@{n} for various n' ' test_must_fail git rev-parse --verify main@{$Np1} ' -test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' ' +test_expect_success SYMLINKS,REFFILES 'ref resolution not confused by broken symlinks' ' ln -s does-not-exist .git/refs/heads/broken && test_must_fail git rev-parse --verify broken ' From patchwork Mon Jul 19 18:07:27 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: 12386453 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=-12.7 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 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 4566CC07E9D for ; Mon, 19 Jul 2021 18:12:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 309B4610FB for ; Mon, 19 Jul 2021 18:12:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354544AbhGSRbS (ORCPT ); Mon, 19 Jul 2021 13:31:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380087AbhGSR1h (ORCPT ); Mon, 19 Jul 2021 13:27:37 -0400 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 68C9CC061762 for ; Mon, 19 Jul 2021 10:52:08 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id f9so23113323wrq.11 for ; Mon, 19 Jul 2021 11:07:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=o9KVw4pEzNFeWgplGe9YGi9/mdHySu7RVQZAxi7KePI=; b=W4PKaestanixrt2FOdHBJsITOjaT00UWNafMBZJOQP/crbUseFMKouJETyJvYBBJ0T u/jej1h1lAejkUtjcNpLREaK8ueKZ1cLeshFOffmPAp1tjnL2/pjcDAsgtRbO7z5mriw R4tqYuxn2jRK5l183iPFfR9AfIIs2ugxzSywKXVmBFcTcRBeANC8pO+XO60sCSXsTOFm YB3+URzO8O4JpUh+AM2fYO3jMfItHKTkvag2fln0Fnygun7PBE9tJIkMf3I0hwUgOlNv 78IRhZX2CVqi5WbtR97RkcUMiHbXIBJmVdqFhfsKhLWwJEq9qYqwHbbUpTo17NCp+TFa Kc9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=o9KVw4pEzNFeWgplGe9YGi9/mdHySu7RVQZAxi7KePI=; b=SeyJHvcaDys/hJklih5QBqrFMhRDShv8q1TY0SFs3thZ6Qqd5q08CCm9mvz438QKaS nRO3EsRrtLR3bWF+ct/3g5Lf8QddLvRTP4B1qE8QVghHTp4iaEIRLzQxmGjFLb7nlHPT l9ifgNm85POnirmVsxAaTC1pHRUhgNI6lDPTqDFl5ol/SmLEHB/OqIlhM8btQXLdSHay 1Vxgzz2wojOPXd5YHJFZfZXzd1puIDQ+ImMIrSdeCyjriryDOZvUgzsgxIUHtKIV9dle nYIQBc0QjiSFSHpFn4kHBnPz2LVB/siwJqvtXXOuBxi/7VCfTioikd8DeARGus5Fge7c OOCg== X-Gm-Message-State: AOAM530xZtYue8075U1T/xBxvrBMpTKr/TgnU7a47EHk1WEyxx/nV062 voMAQDarwjhjmC0/nsRXimCpspt2tQY= X-Google-Smtp-Source: ABdhPJwhStX8ZaXiaLknj5Yp6YCsin+91qEBBbdYM/kr3mpOiQ4oLd3hmVRNzqLH+rQYtAkHpxq6Ag== X-Received: by 2002:a5d:4e43:: with SMTP id r3mr31070097wrt.132.1626718053299; Mon, 19 Jul 2021 11:07:33 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g3sm21748841wrv.64.2021.07.19.11.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 11:07:33 -0700 (PDT) Message-Id: <695921cacb68dede0deef3a197bc9cd89c9cf2e3.1626718050.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Jul 2021 18:07:27 +0000 Subject: [PATCH 3/6] t6120: use git-update-ref rather than filesystem access 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 Signed-off-by: Han-Wen Nienhuys --- t/t6120-describe.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 1a501ee09e1..bae2419150b 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -107,7 +107,8 @@ test_expect_success 'describe --contains defaults to HEAD without commit-ish' ' check_describe tags/A --all A^0 test_expect_success 'renaming tag A to Q locally produces a warning' " - mv .git/refs/tags/A .git/refs/tags/Q && + git update-ref refs/tags/Q $(git rev-parse refs/tags/A) && + git update-ref -d refs/tags/A && git describe HEAD 2>err >out && cat >expected <<-\EOF && warning: tag 'Q' is externally known as 'A' @@ -135,7 +136,8 @@ test_expect_success 'abbrev=0 will not break misplaced tag (2)' ' ' test_expect_success 'rename tag Q back to A' ' - mv .git/refs/tags/Q .git/refs/tags/A + git update-ref refs/tags/A $(git rev-parse refs/tags/Q) && + git update-ref -d refs/tags/Q ' test_expect_success 'pack tag refs' 'git pack-refs' From patchwork Mon Jul 19 18:07:28 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: 12386455 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=-12.7 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 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 6CD16C07E95 for ; Mon, 19 Jul 2021 18:12:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 589F5610FB for ; Mon, 19 Jul 2021 18:12:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356368AbhGSRbY (ORCPT ); Mon, 19 Jul 2021 13:31:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380088AbhGSR1h (ORCPT ); Mon, 19 Jul 2021 13:27:37 -0400 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 B5030C061766 for ; Mon, 19 Jul 2021 10:52:08 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id d2so23186548wrn.0 for ; Mon, 19 Jul 2021 11:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=lvHwdy9rE59CVyvJ5nfZvFyTIKKxP8gj7MxdUetQth4=; b=StKwcPP761gRiXgLd4vxRHNMEDozC0h3RqAU+ZZL8xqG/WW6iklLU8t1q7Saq0SGlR 8YWDkz++gaWIwpg43lWE8DkMEXxe4z05/J0k4yfOZRk7fh1QfnlNa60SWY/muYqokGJy yn5ZZY61lMf7eRO7DAEqSLoXOQD29V5h5SClYi+M1DVKTiWC8M4Jz926vcdhe6FliOmb 3IIxlh+QLoEnSBtWDg5U3ULl4xQoWqY6/UfqtYNEDqtVSy0UQ5LCKBOmD5KdWGRWWD2h qYGAjwDTGXaIDI7CfdLqqrVDIjwBUyo5M3ALS90uLfZBTFNkheSToe9TKYOLyYC/Z8ao UJNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=lvHwdy9rE59CVyvJ5nfZvFyTIKKxP8gj7MxdUetQth4=; b=DOaCkGNbrxhaZN72orDRjVaY3NhGLV//EkGJDCAJBo0+QKqIbiZT0XmRqiQLg3qh9D kefQzgC25q8XkmXz+JQUBok27Yk9ahfr1+HTjX0klLZ6mahSKHd1gyd/L0Go4NRpppOp bWgG5odiWbfThrFxhN4xlk/2AX95LgSDW1ugnuT3x8sf5Kg25kMIf3cI4lqTbT52NEQP WtHIsxPjZTYmNsKtOZDTiSarFddyKBSKRxA01l7kFjG9IBVKVTHqsb8srqvdS5iTtGVo G1WxAwbgXqHS9Mannfc1u7ARB2nMYwaoDilJiHk6hGnLrAb95n/PQbWsrlC3qIshM2oL b9Bg== X-Gm-Message-State: AOAM533cVQXuVDn28gj/ft9snEJWjHJzgrxo5IIMGsoW1ZI+elxRN5eq nSjtl0VhGRjFm4XceJXq7ognLxDLqhw= X-Google-Smtp-Source: ABdhPJzfvubiR+/Eq7pLWOVw95XpXhxeAt6lIKCMwJh4yslBxNmRR5gTTRzQGOWJq0XgX0QuBww+Hw== X-Received: by 2002:adf:ea4c:: with SMTP id j12mr30713348wrn.138.1626718053885; Mon, 19 Jul 2021 11:07:33 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z13sm21576438wro.79.2021.07.19.11.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 11:07:33 -0700 (PDT) Message-Id: <94d7e144f54c423c865dcd475b042469f07f4221.1626718050.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Jul 2021 18:07:28 +0000 Subject: [PATCH 4/6] t7509: use git-update-ref rather than filesystem access 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 Signed-off-by: Han-Wen Nienhuys --- t/t7509-commit-authorship.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7509-commit-authorship.sh b/t/t7509-commit-authorship.sh index ee6c47416ed..d568593382c 100755 --- a/t/t7509-commit-authorship.sh +++ b/t/t7509-commit-authorship.sh @@ -147,7 +147,7 @@ test_expect_success 'commit respects CHERRY_PICK_HEAD and MERGE_MSG' ' test_tick && git commit -am "cherry-pick 1" --author="Cherry " && git tag cherry-pick-head && - git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD && + git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) && echo "This is a MERGE_MSG" >.git/MERGE_MSG && echo "cherry-pick 1b" >>foo && test_tick && @@ -162,7 +162,7 @@ test_expect_success 'commit respects CHERRY_PICK_HEAD and MERGE_MSG' ' ' test_expect_success '--reset-author with CHERRY_PICK_HEAD' ' - git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD && + git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) && echo "cherry-pick 2" >>foo && test_tick && git commit -am "cherry-pick 2" --reset-author && From patchwork Mon Jul 19 18:07:29 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: 12386445 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=-12.7 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 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 6AC8AC12002 for ; Mon, 19 Jul 2021 18:11:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5318961248 for ; Mon, 19 Jul 2021 18:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356034AbhGSRbB (ORCPT ); Mon, 19 Jul 2021 13:31:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380070AbhGSR1g (ORCPT ); Mon, 19 Jul 2021 13:27:36 -0400 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 79981C061767 for ; Mon, 19 Jul 2021 10:52:09 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id f17so23146166wrt.6 for ; Mon, 19 Jul 2021 11:07:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=h6uXKl0tUCfl08p2NwWTeTQTNvBkftMiBGuKvpgJW90=; b=g8oBwZfS6JSZvpqQoAW479p73aD32tSrKnDOcs4ohdM+928iMxqxde56IIUHLAICaF sTlo2ruQGz7pxT+1oZgU3szA5HkQamNsvDEgUZ4D+W4cJIBEZ5jVt7r9Nv0DL4Te+f+R wEfn8hbwtfaNjf5L3np814I5iwpthYbxFrxL6nHSu9cAEVcV2ePcBtZ6WBSLRPB/MWj8 pp6sc7Zvi+w7ooW70xF8sB+Q30YycNWDhUm6W4Pf76F5QgeRTHbKFdH5pXsgwhZppYgC fTYz5fZ/rd/MQONcn6S+7K2GhZWkL8fKsuMFl6y7TmbCywv3mNDzkicWo3tr9JCwjEuh yzPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=h6uXKl0tUCfl08p2NwWTeTQTNvBkftMiBGuKvpgJW90=; b=jr50VE1/NuvrIMhjhYXJ6a4DXNAh9mfBevTVSiuI7Ex1Sd2JPzFbWTI9/Tj02eBbhI 1hpA6AR0syog4nXm2bZVeXUzznYyeGUNDhGRv1iw9GYaj/pNWQiJ2K8rslieb7TgbABa hsBPH6uQQ8EBCx5uILsccZ9yZWThAeCfqKQbC8TMqQaMzY5jHDKU4EzvqjL8A+BEcIdE eqpsL/5eYb5/6NkylGv3a6ZrLQCXTgG+0Y+CYaSngOJ+TrkhaneoorZpa08Uz8HMf2fU ZSrdTqVRa/vCSaYznyVedkpI/NMrnJqqXRScuj0VsDb7ZrE/NXnUkQ4h6fLS9BSWW7MU e9hQ== X-Gm-Message-State: AOAM530CxRYeAwPMZT5zeuU7CnItOCeD3rVJYhnT3+9JM6VKxaiXfpxh VtJ2D4Q8inY/o6WcIFVZE4kiVmv1XNw= X-Google-Smtp-Source: ABdhPJzbmaS158GxmSqagaGb1Roxw/QPLcxe6eheeyQVGmxRNshCAEycGYh778h0Ik4CV9j70K7rfQ== X-Received: by 2002:a05:6000:1375:: with SMTP id q21mr31466568wrz.147.1626718054561; Mon, 19 Jul 2021 11:07:34 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z6sm7695538wrw.9.2021.07.19.11.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 11:07:34 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Mon, 19 Jul 2021 18:07:29 +0000 Subject: [PATCH 5/6] t3320: use git-symbolic-ref rather than filesystem access 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 Signed-off-by: Han-Wen Nienhuys --- t/t3320-notes-merge-worktrees.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh index 052516e6c6a..6b2d507f3e7 100755 --- a/t/t3320-notes-merge-worktrees.sh +++ b/t/t3320-notes-merge-worktrees.sh @@ -46,8 +46,9 @@ test_expect_success 'create some new worktrees' ' test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' ' git config core.notesRef refs/notes/y && test_must_fail git notes merge z && - echo "ref: refs/notes/y" >expect && - test_cmp expect .git/NOTES_MERGE_REF + echo "refs/notes/y" >expect && + git symbolic-ref NOTES_MERGE_REF >actual && + test_cmp expect actual ' test_expect_success 'merge z into y while mid-merge in another workdir fails' ' @@ -57,7 +58,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' ' test_must_fail git notes merge z 2>err && test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err ) && - test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF + test_must_fail git -C worktree symbolic-ref NOTES_MERGE_REF ' test_expect_success 'merge z into x while mid-merge on y succeeds' ' @@ -68,8 +69,9 @@ test_expect_success 'merge z into x while mid-merge on y succeeds' ' test_i18ngrep "Automatic notes merge failed" out && grep -v "A notes merge into refs/notes/x is already in-progress in" out ) && - echo "ref: refs/notes/x" >expect && - test_cmp expect .git/worktrees/worktree2/NOTES_MERGE_REF + echo "refs/notes/x" >expect && + git -C worktree2 symbolic-ref NOTES_MERGE_REF >actual && + test_cmp expect actual ' test_done From patchwork Mon Jul 19 18:07:30 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: 12386451 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=-12.7 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 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 5ADA0C12002 for ; Mon, 19 Jul 2021 18:11:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4CF28610FB for ; Mon, 19 Jul 2021 18:11:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355311AbhGSRbM (ORCPT ); Mon, 19 Jul 2021 13:31:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380089AbhGSR1h (ORCPT ); Mon, 19 Jul 2021 13:27:37 -0400 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 45803C061768 for ; Mon, 19 Jul 2021 10:52:10 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id f8-20020a1c1f080000b029022d4c6cfc37so12101097wmf.5 for ; Mon, 19 Jul 2021 11:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=vysnlRXYw/aOCYJK3a3w3iXK3uaa7j22KJHUUCfJpig=; b=nK1VCEPaKynMxXUgV5qHMyfP2eK2gLmaRRCnmwnLrdkR1mIqjTzVihjnO9KeiUVKwV v3fbWhU5f6Q6rUlfPlj+/f9M15kHr7XX17nXFRwUpF0otRIqParVsgYvWmENgpiOXdnj 5D9z3QNfl0c53S4VUw7o6bUF/JB0+Nurygw9MPKLGt7vtlQ1hYV9CT5YiNWKNabq4TCn 08eE8TBSKalrJWjtwGb0yVEy5ur2FvMwUVrJO/jVxUoCo6GmRi7hmx6YwAqTnoG7+si9 0/UkptGwsVN75NIUWN+ZWv3xYtQUQCHZ+4lx6UwQJDZnLpXSi1s0GXlXlREuJNKGDZYS dvtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=vysnlRXYw/aOCYJK3a3w3iXK3uaa7j22KJHUUCfJpig=; b=Ak2U6igc8JyIzV65+JzFtHcmKGOKIX3sl5NPNlYkQ5V2S7Y3zTeWNu2Z4MORj6BIIZ /bj9b2FCq3MmaPh/sJj9hLPQ8cDi3lsfy1l+ItswFNeMK5J+Qe6srBXulxMYbgSfwuDJ IpLvcYRVwBSTVhbxxGr6044wYzgUKQ+hbq5TNDBMRjPH1PHJJTaxGaXVDKWJipKgc6my BhJlEwABBC1AzhtwglJ49IgcLySl+lYgRwEC25wHowzIgocbiYU/qCiAEtDzC7Wgvukw VYVKNq34oHGGnZr9yUbMIxGVxd7MJ/cXvhhAXkpiV/OSkT8zXBC8PpDz9dU+01eWQdnZ 3Kdg== X-Gm-Message-State: AOAM5303Bwpog2r6sDcLvzAtzAnDB7zWoaRX8U8iJIeerzmGXCQvx30/ e5pEvygj+8RcPCM06DZpLFSgyuFec4U= X-Google-Smtp-Source: ABdhPJyak2aYmB7+RFvpe7dD0CW7DUNts5t11CSVm0ZvumVuz/MToVqd4KuDt+d3wra8qCrx1aIASw== X-Received: by 2002:a05:600c:a01:: with SMTP id z1mr33449831wmp.77.1626718055263; Mon, 19 Jul 2021 11:07:35 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b16sm22219159wrs.51.2021.07.19.11.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 11:07:34 -0700 (PDT) Message-Id: <4d83f70e13323c97bbae685c3ee6f5c94876cf78.1626718050.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 19 Jul 2021 18:07:30 +0000 Subject: [PATCH 6/6] t2402: use ref-store test helper to create broken symlink 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 Signed-off-by: Han-Wen Nienhuys --- t/t2402-worktree-list.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh index fedcefe8de3..4012bd67b04 100755 --- a/t/t2402-worktree-list.sh +++ b/t/t2402-worktree-list.sh @@ -230,7 +230,7 @@ test_expect_success 'broken main worktree still at the top' ' EOF cd linked && echo "worktree $(pwd)" >expected && - echo "ref: .broken" >../.git/HEAD && + (cd ../ && test-tool ref-store main create-symref HEAD .broken ) && git worktree list --porcelain >out && head -n 3 out >actual && test_cmp ../expected actual &&