From owner-freebsd-git@freebsd.org Thu May 14 19:46:29 2020 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 32C832DC79A for ; Thu, 14 May 2020 19:46:29 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) 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 49NMVX1PNMz3Jsn for ; Thu, 14 May 2020 19:46:27 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f65.google.com with SMTP id f4so2082216iov.11 for ; Thu, 14 May 2020 12:46:27 -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; bh=DVIvwKUkL2sQZWMY0on/MAf7ct6vk1PuYnoa4Qu6Kr4=; b=IFuGkp1+zotyGJirt/xFz9TF+YHRznz1zv3Q9n2M15JzmUaSdvQ+JdZv4/+1sPhC0h 1KnFu7ooj9BVy7BWGNcxPHUM2tPy4iafCf9Lvog7OiyX+S7ihoTyIFuor9AQSqPk4C4h 4pKjZlnt5zeiVKSyQu9hb98DaGis3u+H3eDf+Ny4na+J7Cfo5NcO1z/8YLFWEogOopp3 bptNcNLLjWrkaFEEMCc3/7w9tvLh1VyooRJGd88vJBt0AvQWBQKh3rvqYoGK7MXlfGc6 rQYkYIXqVPFsRfB/DjqQVWGnifm/WPfbttRLmdNDgmd/tK7ac1nNzvhzfPiLE/eK5QaA yhGw== X-Gm-Message-State: AOAM533RpwSWO1hmQp2hSesnx07GJTKDGj9L14RISE6D4A0P90Bbq+dF 4qjr46hGIF5G8X/vbZ31FtyNA33hajGn4O+/wNHkowMcqb4= X-Google-Smtp-Source: ABdhPJyXPQTdqiup+t79FJ2/gXmwhHbNLfgTeCHgocDUvRfa68+XHhE4AUxCK/PxIaigw/gjOKhMGM32KMvLihDvorQ= X-Received: by 2002:a6b:7c45:: with SMTP id b5mr5689042ioq.31.1589485585541; Thu, 14 May 2020 12:46:25 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 14 May 2020 15:46:12 -0400 Message-ID: Subject: Re: Experiments using git subtree to manage FreeBSD contrib/ To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49NMVX1PNMz3Jsn X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.65 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.16 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.988,0]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[65.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.17)[ip: (0.01), ipnet: 209.85.128.0/17(-0.39), asn: 15169(-0.42), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; DMARC_NA(0.00)[freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[65.166.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_TLS_ALL(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 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: Thu, 14 May 2020 19:46:29 -0000 On Wed, 22 Jan 2020 at 09:33, Ed Maste wrote: > > Tom Clarkson posted a patch set[3] that allows command-line control of > the subtree split process and avoid the undesired part of the commit > graph. I tried the changes, and the patched subtree split works as > we'd like. Tom Clarkson's subtree work is now submitted: https://lore.kernel.org/git/pull.493.git.1589176201.gitgitgadget@gmail.com/ > base-commit: af6b65d45ef179ed52087e80cb089f6b2349f4ec > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-493%2Ftqc%2Ftqc%2Fsubtree-v1 > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-493/tqc/tqc/subtree-v1 > Pull-Request: https://github.com/gitgitgadget/git/pull/493