From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 1676420248 for ; Sat, 9 Mar 2019 17:27:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726435AbfCIR1i (ORCPT ); Sat, 9 Mar 2019 12:27:38 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:52275 "EHLO mail-wm1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726308AbfCIR1h (ORCPT ); Sat, 9 Mar 2019 12:27:37 -0500 Received: by mail-wm1-f52.google.com with SMTP id f65so602104wma.2 for ; Sat, 09 Mar 2019 09:27:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=dT+BGA+10ydTtdR07BBmbBan0V3BjkKdCHQz9HnRBSM=; b=SIQh77OikOk3zSAqwPNDxYdF5PGzkAuzPpX8iIg9/jIFFCNAXctMmEUXIwAdvlwYT7 hjRBOsAIIiHdxvhJmC4zyDHLKrAMkYUFj4Nz82rqNnMqtTYtWjyfK/PXiaRzVlAF4mLD YnDa5KghLB8o9to5MF6LqebtheCk3mTBu9bWPLpk+1UnL5JdP0ZtiD20ecMtrdy8eexy H4Jb+Jz+bcmthXqYMtspa8W9EznBBB75lCWPn8etwvaElARQMuanLPWEwzK607a6YpAI h4BSHzdMBqbw+Q4jvdpIoRLmmlftLNnvsFndik+iZ3jZlcE+JTcXE7VZ69e9ckbCl0zA YRWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=dT+BGA+10ydTtdR07BBmbBan0V3BjkKdCHQz9HnRBSM=; b=lpqC9HSvKrVcM9r7SAzSMXQ/dBdpQwmoZTxXkq1hPwxxQeCgl8kGg5hhtytyHX9dd/ f0ftrzMnkYO1Fu2ADW8mSe2GwpyM507X8EhVBJL49AQBFp9J49oq+U5Q/BFL6eUTAWrV YIfZYpS+a3hXmI+J3KlxQ6ggfqO0FoimqPESZCQAZ3kgz9QZOaCqvhfU+PbaKidVhjU4 KVuvtckyMmGyP90jLdr5Rirv35fgweprJoewMBlZsfEtmb23S+zcJQ+HWhheOmp3bbSi lCQIZ1GU0k8H43jppyHbAIHi12LxZLCYganOX2gRGb2INMHyj3hyV/K1IV+4PKZQCTJZ +NCw== X-Gm-Message-State: APjAAAWXtN0uWQXNkcL3Ez42iUkhf970JPtB2PaMJlsLMRqnGZBskTwo fbOMBpZ4qxZWwOQnATnVrnk= X-Google-Smtp-Source: APXvYqxH/ucMkWk/qEXAfM+Z43xhX2m40kmm5uhSxtHuSwrX+9elwbg4+JkLbp39OuwmZlXDAHqGFw== X-Received: by 2002:a7b:c017:: with SMTP id c23mr12331868wmb.50.1552152455261; Sat, 09 Mar 2019 09:27:35 -0800 (PST) Received: from localhost ([95.148.214.107]) by smtp.gmail.com with ESMTPSA id q5sm1472634wrn.43.2019.03.09.09.27.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Mar 2019 09:27:34 -0800 (PST) Date: Sat, 9 Mar 2019 17:27:33 +0000 From: Thomas Gummerer To: Duy Nguyen Cc: Philip Oakley , Junio C Hamano , Git Mailing List , Jonathan Nieder Subject: Re: What's cooking in git.git (Mar 2019, #01; Wed, 6) Message-ID: <20190309172733.GC31533@hank.intra.tgummerer.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.2 (2019-01-07) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 03/07, Duy Nguyen wrote: > On Thu, Mar 7, 2019 at 7:34 PM Philip Oakley wrote: > > > > On 06/03/2019 09:44, Duy Nguyen wrote: > > > On Wed, Mar 6, 2019 at 8:34 AM Junio C Hamano wrote: > > >> * tg/checkout-no-overlay (2019-02-04) 9 commits > > >> (merged to 'next' on 2019-02-04 at 9968bcf4fb) > > >> + revert "checkout: introduce checkout.overlayMode config" > > >> (merged to 'next' on 2019-01-18 at 1e2a79ba5c) > > >> + checkout: introduce checkout.overlayMode config > > >> + checkout: introduce --{,no-}overlay option > > >> + checkout: factor out mark_cache_entry_for_checkout function > > >> + checkout: clarify comment > > >> + read-cache: add invalidate parameter to remove_marked_cache_entries > > >> + entry: support CE_WT_REMOVE flag in checkout_entry > > >> + entry: factor out unlink_entry function > > >> + move worktree tests to t24* > > >> > > >> "git checkout --no-overlay" can be used to trigger a new mode of > > >> checking out paths out of the tree-ish, that allows paths that > > >> match the pathspec that are in the current index and working tree > > >> and are not in the tree-ish. > > >> > > >> Will hold. > > >> Waiting for "restore-files" & "switch-branches" pair. > > >> cf. <20190205204208.GC6085@hank.intra.tgummerer.com> > > > If it's ready for master, I'd love to see it merged. Either that or > > > topic is rebased on 'master'. There are separate checkout changes in > > > 'master' (mine, sadly), and because switch/restore moves lots of code > > > around, I need to create a merge of this topic and master as the base, > > > or you'll get horrible conflicts. > > > > > > I should send switch/restore again soon. There are still a few > > > unaddressed concerns for git-restore since last time. Probably time to > > > refresh those discussions. > > > > Just catching up on back emails: > > > > The one point I noted is that "Overlay" is a new magic term without any > > explanation within the _documentation_. > > > > It would appear worth it to also add something (follow up patch?) to the > > e.g. git glossary to clarify how overlay differs, or is similar to, the > > different merge and reset modes. > > I think Jonathan questions the name "overlay" too. Since this is > similar to "cp -R" mode, another suggestion is --copy-mode. That would leave the negative form as --no-copy-mode, which almost sounds like we wouldn't copy anything. I think that would be more confusing that [no ]overlay mode. I'd be fine in general with changing the name, if there is a consensus for a different and better name, but I also think overlay is reasonable, so I'd rather leave pushing for a different name to someone else that has strong opinions about it. Philip, do you think something like this would help? Not sure if it should be called overlay_mode in the glossary, rather than just overlay? --- >8 --- Subject: [PATCH] glossary: add definition for overlay Add a definition for what overlay means in the context of git, to clarify the recently introduced overlay-mode in git checkout. Signed-off-by: Thomas Gummerer --- Documentation/glossary-content.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 023ca95e7c..70e6477a9f 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -287,6 +287,11 @@ This commit is referred to as a "merge commit", or sometimes just a origin/name-of-upstream-branch, which you can see using `git branch -r`. +[[def_overlay]]overlay:: + Only update and add files to the working directory, but don't + delete them, similar to how 'cp -R' works. This is the + default in a <>. + [[def_pack]]pack:: A set of objects which have been compressed into one file (to save space or to transmit them efficiently). -- 2.20.1.495.gaa96b0ce6b