From owner-freebsd-git@freebsd.org Fri Apr 2 17:56:26 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 402F257D72D for ; Fri, 2 Apr 2021 17:56:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FBnmV1M05z3hbx; Fri, 2 Apr 2021 17:56:25 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f171.google.com with SMTP id u2so5254241ilk.1; Fri, 02 Apr 2021 10:56:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yKRV0GTo+o3UFnkXXnFi7vMLX2LL2+FzqmzvanG6GYc=; b=Y24O0Ps8yFQRVeY2B/ED0y++uyp1Dl36ktjtMfdC4ZKNT+nOo0bFRB6BXZdqdm+BJe 51/ffnYPq7vswRUqme3nGm88uVFb6dMbO5hweEjPq7AobjI9IxiuDeenJtzBdotHGnBW WJ2VSg3FSCKovZRcDyV8s/sSquN8xnFtdVv8w5SYIc/h+G/JpZG0LmVtgkgNmNkf4wXR c+k5rIElcuuIbaSHzhqTxzNKda+JxQlWEowxphyD66G7OV8UIUAjPL75Wz1eZlshTQct +tDzlueVVykaOXtEgsLsSLLl4WksfEMkfKDg7Dd3Z+xrsWWvrt6wxts8grpJSBvYVsry M2fQ== X-Gm-Message-State: AOAM531e4QS+kiJ+Z/ZqrHcrmi54KUHtbir30ZpIiGoDN9XYsfJjjiWG zlDRnHC4rMKgMo+jovVe5eQaa9b1HINQosfo80o= X-Google-Smtp-Source: ABdhPJz2RnYJxgoRYHUZgk+frO5Mt1S2zylrMwvxu/KcGWRHWSIdzwHPgE4jg7sh9N1ur9phfOy5xT6K6s0v+j5JYZ4= X-Received: by 2002:a92:902:: with SMTP id y2mr11587257ilg.98.1617386184893; Fri, 02 Apr 2021 10:56:24 -0700 (PDT) MIME-Version: 1.0 References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Fri, 2 Apr 2021 13:56:03 -0400 Message-ID: Subject: Re: OpenZFS branch tracking policy To: Warner Losh Cc: Martin Matuska , freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4FBnmV1M05z3hbx X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Apr 2021 17:56:26 -0000 On Fri, 2 Apr 2021 at 11:50, Warner Losh wrote: > > We'd always hoped that we'd be able to do subtree merges from upstreams > that use git into FreeBSD. The big worry, though, was that this would > needless bloat the repo with a lot of history. We don't want, for example, > all of LLVM's history in the tree. We'd always anticipated that there'd be > some things we'd just accept the history for, since it is similar in > character to the vendor branches (though of course a bit more). Note that if we do want to avoid bringing in the full history `git subtree merge` supports a `--squash` option. This brings in the set of upstream changes as a single commit, without bringing along the associated history. We will need to do more experimentation to confirm that the full process, including bootstrapping, will work as we want. Assuming this all works it should allow us to forgo the use of a FreeBSD-specific vendor branch in src. We've discussed mirroring any such 3rd-party source in some FreeBSD-controlled repository. This would allow the project to retain a full copy of the history, but avoid bloating src with it. I agree with Warner that we may want a different policy (full history or snapshots) for different contrib sources.