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 270FF1F404 for ; Mon, 26 Feb 2018 21:30:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751785AbeBZV35 (ORCPT ); Mon, 26 Feb 2018 16:29:57 -0500 Received: from mout.gmx.net ([212.227.15.19]:37685 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751761AbeBZV3x (ORCPT ); Mon, 26 Feb 2018 16:29:53 -0500 Received: from [192.168.0.129] ([37.201.195.115]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LsTge-1ejqmx37SS-0121p7; Mon, 26 Feb 2018 22:29:47 +0100 Date: Mon, 26 Feb 2018 22:29:47 +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 v5 09/12] sequencer: make refs generated by the `label` command worktree-local In-Reply-To: Message-ID: <620954c3c964cdaa43b41b598b3c508cd6be9049.1519680483.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:li8QOUjoB6mHMp0ygENpXGjtbWJam6mMVWA5lqYtOE3RBKBpdVR c21EbJFgtHyANr/CtMLTmux1iQfF+eYi6PwIG3xFdSQIWSu8di0bc2sKfb60xRrNC33vBmx OgZnVKghsgsAe9N7NhtqwxPLj3xrTpE22nIESWpcsuz/r+V+84uXREyoE1UwRUXAaZi08Gb YFz+lf4Fr43hYhKnjnrPg== X-UI-Out-Filterresults: notjunk:1;V01:K0:O4zQVfQo83M=:BjyZz07BbzfZ5Nopu1+rKk zsjjlwk62tBSIEXXNRGbUsqmUR2lqfPSkFnXNq14p0E+FqAkn5v2VyTrPbc2fSW89udYhOC+h 2b4Aq3qocKebzbkDKcXdMzn6h5ItkGX/T6juyD3a/BhzhdGaj+G7/2ds9IhYtfZ8aEI+RjMBj hd8fQWkpkhCXMZw3yNqrxqxDU8Hapus+yYW8bICYIqAMnsyE0aRPbAFPxztNPJWYAK1iQ7Cr+ YleN9vYkc0FCuxfIY4OZTK4RCFAicfE7txjwJnMl9T2MtiBRiVAMuWNc2oryfSxRmxsHrn+bu RejPrftaReyxoWykDEo/GVbdc7+ZFpg/TuoSNAGZVx6zrW4ziLdbRLYE9zsMWq+3eIqAm49oc 0rmFKR3QPMplHqdk/rBmqlHwwO6cIRPiTRHL7a3ftl7TrgSPMfoKCdUDTfIVaZbZ2wJGfTa4R 8tqL8eLToe7FmwsOSI4ZDtrwyABTcOlWBHAjr2srZf0HjeNhcXSncv542tTN6EZfaza2ybt// wlYttPyNrIqNEJrRTRSaX+rKrCu4OD2jZ9ET2RJ5WCFpXDTazn+vL6P//Kko9CULu2gHelNcA WgPk5fUzdIIBxDHQwbIKfdJ2mC76nc75CypYbPUC9w0+F0i1fT1etn25X76108Wgeax+rfTZ9 450vleLLhw86srwEvYORDY4WPi3mu8Id06NGk/zWi3V46/D6ku+vK8zKv/vxbVLWPXC/+ruVF W//BCAZBCZAC9Vsnt/wgvBxpe3REIVZ7/rOI6x0Ss+wAsmXCz8B8R6QxJsKM3ffH00AMTsXCu +Gts9aOWxHxbPUwp2ISOOluGwDq7aJnlJavZVOHU884xucFVSdsyK8aoF8dIVZ2Jl9b/uYz 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