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-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id D36761F5B1 for ; Mon, 29 Jun 2020 19:04:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728242AbgF2TD4 (ORCPT ); Mon, 29 Jun 2020 15:03:56 -0400 Received: from dcvr.yhbt.net ([64.71.152.64]:42568 "EHLO dcvr.yhbt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730427AbgF2TDw (ORCPT ); Mon, 29 Jun 2020 15:03:52 -0400 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id DF3791F5AE; Mon, 29 Jun 2020 19:03:51 +0000 (UTC) Date: Mon, 29 Jun 2020 19:03:51 +0000 From: Eric Wong To: Jeff King Cc: Junio C Hamano , git@vger.kernel.org Subject: Re: `seen' datapoint [ Message-ID: <20200629190351.GA15419@dcvr> References: <20200628192227.GA20227@dcvr> <20200629020427.GA8153@dcvr> <20200629184522.GA1248738@coredump.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200629184522.GA1248738@coredump.intra.peff.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Jeff King wrote: > On Mon, Jun 29, 2020 at 02:04:27AM +0000, Eric Wong wrote: > > Junio C Hamano wrote: > > > Eric Wong writes: > > > > > > > So I had receive.denyNonFastforwards=true set, and a > > > > special cases for `pu': > > > > > > > > fetch = +refs/heads/pu:refs/remotes/origin/pu > > > > > > Hmph. I thought receive.denyNonFastforwards was for pushing into > > > the repository, so it is a bit puzzling that you bring up "only > > > updates to fetch into 'pu' is allowed to be forced" like this. > > > Such an arrangement would let you know when 'next' got rewound, > > > which is another plus ;-) > > > > Yeah, I can't recall when I started using denyNonFastforwards; > > but it was probably a paranoid thing to ensure I'd notice if > > `master' got rewound. > > It definitely wouldn't do that, though. :) I suspect you dropped the "+" > from your refspec around the same time (which would do what you expect). Ah, OK. So denyNonFastforwards was a red herring in this particular situation. I do push to this repo when I did more work remotely from a laptop or another workstation, though. This particular clone and .git/config are at least a decade old; and possibly as old as 15 years if I just rsync-ed it over from my previous workstation... > > > Do you have a separate "fetch" refspec for each of the ones you are > > > interested in? > > > > Nope, I use the catch-all as you describe below > > > > > Or "remote.origin.fetch = refs/heads/*:refs/remotes/origin/*" which > > > serves as the default catch-all (which overlaps with the "pu can be > > > fast forwarded" you showed---I don't recall how we designed such a > > > set-up to work offhand, so I am a bit curious) works as a natural > > > "require fast-forward in general, but a more specific rule about > > > 'pu' allows non-fast-forward updates"? > > > > I only have `+' entries for `next' and `seen', > > the catch-all provides the rest. > > > > fetch = +refs/heads/seen:refs/remotes/origin/seen > > fetch = +refs/heads/next:refs/remotes/origin/next > > fetch = refs/heads/*:refs/remotes/origin/* > > I think you probably configured (or modified) that catch-all yourself. > Both "git remote add" and "git clone" use a "+" in the refspecs they > configure. Right.