From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.6 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id CA01D1F404 for ; Sun, 11 Feb 2018 00:10:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753033AbeBKAKk (ORCPT ); Sat, 10 Feb 2018 19:10:40 -0500 Received: from mout.gmx.net ([212.227.15.15]:55415 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753022AbeBKAKh (ORCPT ); Sat, 10 Feb 2018 19:10:37 -0500 Received: from MININT-TB4PCE7.southpacific.corp.microsoft.com ([37.201.195.115]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LeMWL-1f2znO2uj7-00q9Ud; Sun, 11 Feb 2018 01:10:31 +0100 Date: Sun, 11 Feb 2018 01:10:30 +0100 (STD) From: Johannes Schindelin X-X-Sender: virtualbox@MININT-6BKU6QN.europe.corp.microsoft.com To: git@vger.kernel.org cc: Junio C Hamano , Jacob Keller , Stefan Beller , Philip Oakley , Eric Sunshine , Phillip Wood Subject: [PATCH v3 09/12] sequencer: make refs generated by the `label` command worktree-local In-Reply-To: Message-ID: <43ec5206b6c91279ad322cc2518629bd7769c0d1.1518307772.git.johannes.schindelin@gmx.de> References: User-Agent: Alpine 2.21.1 (DEB 209 2017-03-23) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Provags-ID: V03:K0:hj1qZRuwTeEp+XW9PLUa5QdZ5txFlbWR7eOp2nZjepCbZjA2QRI Ap7v9+Nclk9OMhuLkABglcAQT+600QpFmCX8N57Y+LAOjHsgfUJZPeiQk39GoQI17XcZI4Z AD+ADey4mVhkWU45hTbYeMMnpCjj4Zu/mpvEV+9qrktX605vuJ9wLhDgTgLIAzMCKhJxgB4 uU+IGYISpAl4L99s1NRnA== X-UI-Out-Filterresults: notjunk:1;V01:K0:Q2BrQk69IxA=:se4M+dfwRYRmNDkJCzdNeY BmZG3Nwvb95VzLQBIHShNvojWQLDu69GPHLYtiUrXQqjwA0ET6tby1462yPS7cxrJPsVvzkdp fylpXss0PaderImO3HoopVkhMpxrFFAzCKIs94TaVKG1Re0Ajo2EeH24qk5zwXNwjzKZemf7B eGkeV46e8+n7vjkpo+6EZd8YX7JEfGyy0ZhAXbtSy659GdAL3qwuL0kLkbnn/3gpwONbZQ5IU NYr0NpROM0Em+LnDeNLz0AbmoHzqSGY0qhpldlAb0ZeUiGUi6UFtkhnZfdvdTthqGiBhjuqea x5TEPrvFmtx/krntoX3e8fWwC8ZQlS39OEecXq3ijqKKIdiFz1+V3qH9K0US6ylR4UrOzebjb dssRxBF3Wn6tzNVE+GTlzY9m+J/7r7vMMoiwSR8pWvDRqAPsXo53UOyvTRirLVuHzeAUEP6re W6F2E3xBmp3068jsoq2/FEP3ikPb2Hb8I+71RE/ujHZ6ZRBqHH9BosdPZOKCMFmFxqt85Kq+x TQH1O5ouHgePVfeISNIlUmwoOBdayKROd/+JcjWp1grSBy7K3wt4impYrCSdRRyRDZf55+yC7 ypa/Qfsy0yxY7eGxvWOmhZv8LJ3zcHqLhPhBgmeHg0RgniRd0qT50J3lOIi+4713b4nuPQVZX ULBtdyyHYgg6EtAnOe30KxWmJApif3VNnjBype78K0HVj4OOATHkvrsSessUXYdZN9hKnNU9k /hbaRi83y4IgtfVWHIJrifEbnQYnyuSVIpFLgxJ2lEhJUGP86Y7tEM8/0qxwiu2vTNchY57SE LoQ3DKyRSPNBA99Rbw5sPZ6OC9Bgr/9PlrWM218UaRGQZajQPk= Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This allows for rebases to be run in parallel in separate worktrees (think: interrupted in the middle of one rebase, being asked to perform a different rebase, adding a separate worktree just for that job). Signed-off-by: Johannes Schindelin --- refs.c | 3 ++- t/t3430-rebase-recreate-merges.sh | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 20ba82b4343..e8b84c189ff 100644 --- a/refs.c +++ b/refs.c @@ -600,7 +600,8 @@ int dwim_log(const char *str, int len, struct object_id *oid, char **log) static int is_per_worktree_ref(const char *refname) { return !strcmp(refname, "HEAD") || - starts_with(refname, "refs/bisect/"); + starts_with(refname, "refs/bisect/") || + starts_with(refname, "refs/rewritten/"); } static int is_pseudoref_syntax(const char *refname) diff --git a/t/t3430-rebase-recreate-merges.sh b/t/t3430-rebase-recreate-merges.sh index 0073601a206..1a3e43d66ff 100755 --- a/t/t3430-rebase-recreate-merges.sh +++ b/t/t3430-rebase-recreate-merges.sh @@ -143,4 +143,18 @@ test_expect_success 'with a branch tip that was cherry-picked already' ' EOF ' +test_expect_success 'refs/rewritten/* is worktree-local' ' + git worktree add wt && + cat >wt/script-from-scratch <<-\EOF && + label xyz + exec GIT_DIR=../.git git rev-parse --verify refs/rewritten/xyz >a || : + exec git rev-parse --verify refs/rewritten/xyz >b + EOF + + test_config -C wt sequence.editor \""$PWD"/replace-editor.sh\" && + git -C wt rebase -i HEAD && + test_must_be_empty wt/a && + test_cmp_rev HEAD "$(cat wt/b)" +' + test_done -- 2.16.1.windows.1