From owner-freebsd-git@freebsd.org Fri Mar 27 19:30:53 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 490AE27F576 for ; Fri, 27 Mar 2020 19:30:53 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48psQg54z2z3Qbn for ; Fri, 27 Mar 2020 19:30:51 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id C678027F437; Fri, 27 Mar 2020 19:30:43 +0000 (UTC) Delivered-To: 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 BB5CA27F436 for ; Fri, 27 Mar 2020 19:30:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) (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 48psQJ12cYz3QVC for ; Fri, 27 Mar 2020 19:30:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f43.google.com with SMTP id q128so11012794iof.9 for ; Fri, 27 Mar 2020 12:30:31 -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:content-transfer-encoding; bh=yGfyQxxGTwxeswlxtPtyxnIDCVVXrXegncZC7zdxEF0=; b=Bpkt+116NQpFtGltV5Lor+c5l7vS7suyj3ozfMq6Yj45SU3kGjO5ejIsyz9W5CmBc5 6PoZPGSTkKhWlgINt8nhEQJMP+Tde1qpmmkHXi3N6xEY5AAROcW+gqjmHeRxDhDnaIOp BAmMkOLHFmlioM4sXwNwqdwFaic4TxUnLgdL62Q7BTd8QxI7ZBd4+IJU0yyfX7fBe15m jnAqXS8nRfJ//aYU51JwIIKFg/m3At/Y6Jv0IG63Uf6JJBs2K4QH8XRrLQKlDyw10v09 ZFI4tNXClG9r+JIuA3twlaHwR5AoH01oEy6Gzw41doovoJdKaQxH4jlPhrlJaLfUO0vS klzw== X-Gm-Message-State: ANhLgQ21JPgxo+XYmuPeYNwwG15OQZRG/WhB+39D3KPgoAoZW59Y9HfW LLqoIDhs90LZhpeEFhDUFjLMA3CQ+DxYN68lkjI= X-Google-Smtp-Source: ADFU+vsKvgfkY2cDoexkOHdmIRY3kkKu4uWsGzXRAtF1S7AeZ7F2cND2oGdu1Mvz+MClbCfutzMBOZuF+b3jibkx7xE= X-Received: by 2002:a6b:fd08:: with SMTP id c8mr234229ioi.102.1585337422680; Fri, 27 Mar 2020 12:30:22 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Fri, 27 Mar 2020 15:30:08 -0400 Message-ID: Subject: Re: Strange commit To: Warner Losh Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48psQJ12cYz3QVC 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.43 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.99 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[43.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.99)[ip: (-3.33), ipnet: 209.85.128.0/17(-1.09), asn: 15169(-0.47), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[43.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)[]; FREEMAIL_CC(0.00)[gmail.com] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 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, 27 Mar 2020 19:30:53 -0000 On Fri, 27 Mar 2020 at 15:12, Warner Losh wrote: > > The vendor repos we wanted to do would be complete on their own. We don't= want the revisions of those repos in the main repo. A merge commit would m= ake us have them in the main repo. Then again, maybe this eliminates subtre= e if we can't do that. It was why we were looking at the other one: it crea= tes a repo that is independent of the merged in repo and it requires no ext= ra modules for our users to install. We do want revisions of the contrib code in the main repo, otherwise we lose the history and the ability to easily maintain our local changes.