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=-3.1 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham 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 C6F0E1F404 for ; Tue, 10 Apr 2018 12:30:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753161AbeDJMaQ (ORCPT ); Tue, 10 Apr 2018 08:30:16 -0400 Received: from mout.gmx.net ([212.227.15.19]:34749 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752585AbeDJMaP (ORCPT ); Tue, 10 Apr 2018 08:30:15 -0400 Received: from minint-aivcfq2.fareast.corp.microsoft.com ([37.201.195.115]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0Lhwt0-1ekGuY2vBq-00n7An; Tue, 10 Apr 2018 14:30:08 +0200 Date: Tue, 10 Apr 2018 14:30:07 +0200 (DST) 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 , Igor Djordjevic , Johannes Sixt , Sergey Organov Subject: [PATCH v6 10/15] sequencer: make refs generated by the `label` command worktree-local In-Reply-To: Message-ID: 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:K1:wa3d96JRV7dyuWgWizsE5zEds32stn39OnN136J2PugItt1zYZf uFNP0t8govD//H3CqTYmFPXlNt55xyB2PQlSI/M+xYt1qCOe29X15YioNDzNuIz8X1zT7JA FcDz37G8YHn63kjEFxAf7e7M0Sk8trBADrDncV7qnEeNAyNI/ZOlqxiUWPjelFeVXzRe/hw pUdrdSH0ZgOyJsuBz0Nvw== X-UI-Out-Filterresults: notjunk:1;V01:K0:w2OusW4R6GI=:0g/V8jc9H/lnExBDeZlmnL 8MTNGbfj1C+nxpeNSuD2/ChueDGmJAss+Txokb4ba+qNl4cfKOvUFeB+OXonBL0oIUIp1xvQZ 3kn/3pyEhaPCsusJ0w7yaUtIhtIQQx7M5b2Mn4JCfublN36RvKJJCsPOdiPDOaKk+mnlOK7dx C5lv32AmxyH7PTSKquTVBGwtUjIrZ0ixI+jiid4jyGACc9jbs/YD8+tdqK8ExDkBWoOODVGPO /zN0Yhfj+NIut/fr1xaA0bgjgeYTvinN1GICD5ULfTsMtzMbgjHQXKjYP0ccnEdifUk+cdb/O ZqC4PM4ebg8MVsCzmSY/Af8E6XOZNsronJkH4GTdIR4YzlXd4cG2lQcwNoQ2VNCjMQ7M4+TE2 QzHX0Fbk/VGuHYLDNdV7Nxz90g4VeF2TVcFMvDEM5+1h2/X19RO7O3dlWxmSHDFdBZ7ArCCwO 0M1Wj9pPSXSab/ZW79CrQHBiLFnFF3bVMil9az2PL6XNzz6pnxvUwzrGZ8YwFMEvniznQoDD3 zEYPaNKSBy1Lnxc9o3wT447iuL2y9Y4NpGdjEpN12kuEtU18waIqhvg1utCqBEQYDLsF1r3d6 mzO2vAzeD5UsycUc37KN7lqMoqnrCEOB/LMcjTlODa1t4m4jLMQj3Xl2W2f6smFtZb3yVzRDP nUX3KZlW13inkTya1mmlA204oKBP4mhYXoqIut42AJ17muMkuXGuVhcN46hG0vdDOmqJqGDrb cnURfzZnyiG/Aq1A0VOM7hpa0fsFLK4gG0nqt+OKVN54XbHVFGNVmZuBIRk9UrjLVhMII4Gaf NmJ3zYjCkSkOpEHF0zlEzAktuRS1yZV/sG1XeCgfd7tYvo6P08= 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-merges.sh | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 8b7a77fe5ee..f61ec58d1df 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-merges.sh b/t/t3430-rebase-merges.sh index 1965005778b..95f99d965c1 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-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.17.0.windows.1.4.g7e4058d72e3