From owner-freebsd-git@freebsd.org Thu Mar 26 23:47:56 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 2486A264BF7 for ; Thu, 26 Mar 2020 23:47:56 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48pM9d0lnGz4LxY for ; Thu, 26 Mar 2020 23:47:49 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 643A8264A40; Thu, 26 Mar 2020 23:37:53 +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 5EE42264A3E for ; Thu, 26 Mar 2020 23:37:53 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (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 48pLxy18zkz4HkV for ; Thu, 26 Mar 2020 23:37:42 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f49.google.com with SMTP id h131so8042759iof.1 for ; Thu, 26 Mar 2020 16:37:41 -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=tHshFCRxejnI9RO9xss2iTMQ/KbqxkzjgNkqA5hgPp8=; b=GQ4MXGLYsX0xN0azRvxGYHyTY6LllDh6ntSSq+VpJMN9P0LYXjDkGCwvr5y2/BQ+CQ QkgvPbib2RERhtCWUtUQn3gUmrbFkojVRtyB/ylDJ7lDawzwAVrat3ne3p5xo2NS/KDY AIKXNndE5TuJasK/C8S7oRbllV4ruoDyrQ4mzbo8w9lrWRMNa675JPHacX3FxKCuMmCH kwdCqUht+Oj3AKcNPFE8hYtGaWznqy0EZ8TXovH+IEzFd2LzbUTEq0BaqC+7SbhfJlx1 OUDl9sVaTp3ZsOuoh+PGexOGRZqygYrj+449AYd7guRiH2PPIReYadiGuPtxcx4A88SX 4UIQ== X-Gm-Message-State: ANhLgQ0kVB5erRAsa3YjAwR0G2wnQxz90/QRd2QXr2Ow20PZPyaBUBdt McWLj+Jmw7hY4OYrQQ2Lp7fXH7IVF3aDr7JUhnI= X-Google-Smtp-Source: ADFU+vtSOCywPaOV01vGcksaNOsTv7J8Ly/+jrcD5IU4fOEruZKXbykV7cYJu3x4CRb9DY1k7C036OUAtphgVwBaHcE= X-Received: by 2002:a02:ac09:: with SMTP id a9mr10069303jao.128.1585265852601; Thu, 26 Mar 2020 16:37:32 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 26 Mar 2020 19:37:19 -0400 Message-ID: Subject: Re: Strange commit To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48pLxy18zkz4HkV 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.49 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.60 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; 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)[49.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.60)[ip: (-6.17), ipnet: 209.85.128.0/17(-1.28), asn: 15169(-0.47), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_TO(0.00)[gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[49.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)[]; RCVD_COUNT_TWO(0.00)[2] 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: Thu, 26 Mar 2020 23:47:56 -0000 On Thu, 26 Mar 2020 at 15:58, Ulrich Sp=C3=B6rlein w= rote: > > I guess you're right. Seeing that vendor branches (while not a full > tree branch) are usually "short" in terms of history (only a few > commits, one would hope), I guess we should indeed represent them as > proper git merges. > > Can you open a PR on the git_conv project, please? I will, but I'll have to run the conversion again saving the output so that I can figure out what branch name(s) are involved.