From patchwork Thu May 2 14:23:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10926951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E213214B6 for ; Thu, 2 May 2019 14:23:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2FA026E4F for ; Thu, 2 May 2019 14:23:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C799F28BD5; Thu, 2 May 2019 14:23:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73A29289CB for ; Thu, 2 May 2019 14:23:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726349AbfEBOXy (ORCPT ); Thu, 2 May 2019 10:23:54 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:35667 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbfEBOXx (ORCPT ); Thu, 2 May 2019 10:23:53 -0400 Received: by mail-pg1-f194.google.com with SMTP id h1so1149039pgs.2 for ; Thu, 02 May 2019 07:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6sw18J7e7TGuschUPXM3wzTfKRm4a0+WdSUSqD4U6ck=; b=EytnGMoh3NoxFARha1ER/TdjjAwvH9EDjGghJ89vrXG5lsuIhzzbiINU0FTwLTn5ru GFf5gCzo79iUp82/U8tr2eW1rnnKjXk90YtEbCDDuCxUGV0d5+uvJ0+JEjeTtAmKN7lo 2URo8a/LFeY3JV+g8hpc/M1ehVpnb/q+gUaqydvVOBP+MHvliNQx5dTQ49fCCK1Tkbx2 RKrxzFqs+X1Y0xUSX6Zt61w6a5we2Dm3qLnSSB6q72E6DVxjg3Fu1ZJRKcaTdL3lFze7 rX1Yo5zIvSzQqzGLtOOu2aMHhvANxPNuU9x1cp9oClyi042784uB9uViLaiv5+XlOewN 4wjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=6sw18J7e7TGuschUPXM3wzTfKRm4a0+WdSUSqD4U6ck=; b=mG6AvXoUJFfUMEZruPHYwYgyH2Pnrwqtm5gQt6turWtNBP36erRbL+mrP8QOYiXvvO A3t6K9SjZIQKUW+qVV+cz51faqldZ0x6SHg49ITd34LxgoRrBmqymChtSCXiBiw0cHr8 M9Sx7AiQWCx1bgcz1pbA9tfb4MqnCPpv80yQd335g9nNv++hDovRj70xRRczVJDaHnML xlI0r9XeTeKKAV5vLuX2DisdxkEQYRdA1mjABQDrTnIntP/iiaF/p/LJHa6NbzjjVeLD xqSdJRSjFMCwDUeIp7rzFuNVckMtwu1I2Si0C1uSavooEKYpxcJv9Kfc4WCT57PdZB+1 7E4Q== X-Gm-Message-State: APjAAAXKMuoSjVhnkLtV/HSsGAsSmQrGkOE/Z1s0erNR9UhSI+OLk2Yx WtemF7qyvXsS9LSA7ik7EZ0TzG/i X-Google-Smtp-Source: APXvYqwT5jHelPQoRZcBvBV/bAM4SqJkLk2lk+HLG3nagG1aSkYjy9S64vJR/MdZK1Q46yLYhdrgGQ== X-Received: by 2002:aa7:86c3:: with SMTP id h3mr4330192pfo.169.1556807032829; Thu, 02 May 2019 07:23:52 -0700 (PDT) Received: from ash ([171.226.41.84]) by smtp.gmail.com with ESMTPSA id f5sm10117046pfd.124.2019.05.02.07.23.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 07:23:51 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Thu, 02 May 2019 21:23:47 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmc=?= =?utf-8?b?4buNYyBEdXk=?= Subject: [PATCH] git-worktree.txt: update the per-worktree refs exceptions Date: Thu, 2 May 2019 21:23:45 +0700 Message-Id: <20190502142345.3963-1-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.1120.gde2b49a866 MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This section describes the two exceptions where refs inside refs/ are not shared. Except that it's three exceptions, the third one being refs/rewritten [1]. I was not aware of it when I wrote this part. Update it to include refs/rewritten. [1] a9be29c981 (sequencer: make refs generated by the `label` command worktree-local, 2018-04-25) Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-worktree.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 85d92c9761..8ed5250d5f 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -214,8 +214,8 @@ refs of one working tree from another. In general, all pseudo refs are per working tree and all refs starting with "refs/" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one -exception to this: refs inside refs/bisect and refs/worktree is not -shared. +exception to this: refs inside refs/bisect, refs/rewritten and +refs/worktree are not shared. Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The