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.2 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 6C1441F404 for ; Thu, 19 Apr 2018 12:23:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752391AbeDSMXL (ORCPT ); Thu, 19 Apr 2018 08:23:11 -0400 Received: from mout.gmx.net ([212.227.17.20]:38609 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879AbeDSMXK (ORCPT ); Thu, 19 Apr 2018 08:23:10 -0400 Received: from [192.168.0.129] ([37.201.195.116]) by mail.gmx.com (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MHrk1-1f8JFD2ay5-003gGD; Thu, 19 Apr 2018 14:23:02 +0200 Date: Thu, 19 Apr 2018 14:22:46 +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 , =?UTF-8?Q?Martin_=C3=85gren?= Subject: [PATCH v7 12/17] 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:DIhPSe4bmfqA5zk2GWB3y/dZAHseG25t5/hgvYNFOKzb8g/1b8V r/ttr9hI2mmbiy0+q82bYF+z9yAcCyAT9P1wbEJCzodsAYF0zPhFhEGnwPJ0g8aqFfjbFD8 4jmI3GmvLYzVqU6Ty1UuvJno1yrh84AIssavY98rOP3T1u8Pvu5OaqudsSfdpjHF0Oyx/xJ y1XIk+fhuIXZ7gBFAEAiQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:PD2PMyPA2q0=:zZU/FSMx8OAbfUsSsjuzCw fcXeMy3tJHnnvXwFf8fKV+o1ciDjqPkO/sDith+K5z+ClRd4hnM+Bevx+tfOUc6cPqcAUXyBt XiNTot3z4wL7kgB639D9T8y6/IlFx1Df1esJobApYsKzqkO8VnX49MtwHbZJpm9fyhkwWQhBM R4arpdiSydSfdPo7QCeORQK6juVpPKlodv6uNuAU9Rh5YnIeniIs9yxwo8keOM2+HAp9y8cv5 QTRQTh0wp3FAhB1LpkMAC/5bGAIkb9GKgZstuGCDgXFv3BM7iHn2WLlTVkH9vhYk39CxKy5HI 2Y7d9LaSEXzPg4uIZCE5VQQLX59h2ptf1+3y3pescGVHzHaELhu8jJDpjxWB1y0rTuXKJjQVD BvD2JEUhmkv/u+SkjHDX6rugoX5mku9kuNr5uFtz98WXFSt6ET9z83pyrzZ2mghUOQxcC/nCH BxMfTExUsvGCCM2E4CDBY5dOkkfBK/j/dRLepSgoL0kI/htshuUEl/q2BSKoXA/jeFO8rBA3/ /oQa+UZedQdGuPwADraOVVQJAbNPg5gkOEPYvOlLuabdWg4l8Ppbyn4wJpklcev4wPU9oIcdg 0Q0nInvLfko5ElH5OwapeCPiQ0k+0Nfa+C2bkNQ/COkcpaoHGuTJul4YtY2wS+OAs34tOBETR P6N+j6pLv9Jim05cGfxBv1WsXmiuTXg5Y2EYwNXeW07DahSElECqWbuqM9rvMKFOf9c0AUUsM 0hecPn4NUPzgOgGNXT52lDl7iFBhToYKUw31DS8yuRzZT1uoVoMa/IlVFuFcFU5Z7G57C+bPk YjO3IvdspLdKqFcAWf7c2LKZnv1T+lc168C2T5ogadkGkjTuOI= 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 e80fa068d05..4b553fc78b1 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -153,4 +153,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