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 8C2E41F404 for ; Fri, 23 Feb 2018 12:39:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751507AbeBWMjI (ORCPT ); Fri, 23 Feb 2018 07:39:08 -0500 Received: from mout.gmx.net ([212.227.15.19]:36891 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751456AbeBWMjH (ORCPT ); Fri, 23 Feb 2018 07:39:07 -0500 Received: from [192.168.0.129] ([37.201.195.115]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LwIuc-1eg6Ys08vG-0184M9; Fri, 23 Feb 2018 13:39:00 +0100 Date: Fri, 23 Feb 2018 13:38:44 +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 v4 09/12] sequencer: make refs generated by the `label` command worktree-local In-Reply-To: Message-ID: <620954c3c964cdaa43b41b598b3c508cd6be9049.1519389319.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:OcSQ19b8sgpJd8ZyEcF3ri5iHgdKJebkHvu10NJsKeNU5cHj6kp 69zjeltdsax2iDmwgBAbxMRxbobyKo6SptNhOThKPxzjRKFdwcFKj4zl4xkBIpZwlwl7SSx wYkgs2/FxHCubODQcHr4Wo/HsGgdQxuYMopWWgEGXeEvbUG/4f+zbEBRikCCWLElgiK7lPD YCAX7aT4zf3M2yc4Z+ivQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:JjP6gHDcCHY=:lVAQoCyZylHsTyraMeVsGK tfEvtdDbCQhmmvAoaqIYLANFdIQXjiMXm78+lax/ukYRqMCDWOgVk2NBN2vDz4oU0k6NvMtyu 1biPabf28I7fp3BUy59vnV5tYBMtcO8RGiiB48ymxEBL4t/+UBmA2Mlh6utxRWH1RxQTur2nC QOdguDwSYYFSPyo5jY9i6tyEC+MbdJweAQ5eCyOW94hEVIADfCJ7XnXFeno+voNYxu5djNHUG 7a+34D5JgbJTMQ/lFAJrEUxiiflE1swshb1jId7XhsoVObbO2o8CImp6d00VYVlXjaG2MIxKB 30fi+0HfPb86Y9SFt9sg5OxLumOmbzN7I4fhrZXUL1TOEGh+tJScBkKCDzrdjGYXZbWTuB9WN iNL4SU9uxM2m6G7+pMpCEXuYzq5xIvCgzx0FGMp3HZqBRv/Q6B+ZGZCcNGD6cLSNNtdwRzM+l HR77bZd5fDCfnwe67keygCFM1NHEandfxjY2J23PuMeERi1p3GG+il4qLS66L5lXvTWOr4fA2 wXmj1Nb6wpcUciPD/fsKfxy+D2zQqWffB/7cA5ZE56GE2AGODWv5mN0uVFhkSG0Q76Rsfa9d7 PCJLBQUvUbdjPUvTLguLePj0Ij7/7v9PxP+uzyIci0aAeWteitdRv1OgujnZSXIyeo2qEq51a cH1Sbxr4fL6SmhElaljsa3wfmboBN80vvTVrlOXuTejk3nLzr0tAluF3YhrEHSPlzEkD9f+/y o+D9L0jSncXblqEdmaY5OQqlQ8Ba/xRNv3EbAqsA2mYBMnSPpEJaHt9gSD3s8zh4IUEhA//TV UeupNdUhJyNC13LC49Xkr2aWlKIZDSPL6XIQteObITSmWTv49Q= 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.4