From owner-freebsd-git@freebsd.org  Wed Apr  8 18:36:53 2020
Return-Path: <owner-freebsd-git@freebsd.org>
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 6CDA8278E6E
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Wed,  8 Apr 2020 18:36:53 +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 48yCfr6vz4z4VW7
 for <freebsd-git@freebsd.org>; Wed,  8 Apr 2020 18:36:52 +0000 (UTC)
 (envelope-from carpeddiem@gmail.com)
Received: by mailman.nyi.freebsd.org (Postfix)
 id EB2EB278E6D; Wed,  8 Apr 2020 18:36:52 +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 EAF15278E6C
 for <git@mailman.nyi.freebsd.org>; Wed,  8 Apr 2020 18:36:52 +0000 (UTC)
 (envelope-from carpeddiem@gmail.com)
Received: from mail-il1-f193.google.com (mail-il1-f193.google.com
 [209.85.166.193])
 (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 48yCfr0DzKz4VW6;
 Wed,  8 Apr 2020 18:36:51 +0000 (UTC)
 (envelope-from carpeddiem@gmail.com)
Received: by mail-il1-f193.google.com with SMTP id g15so7705691ilj.10;
 Wed, 08 Apr 2020 11:36:51 -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=DdjSLqp3GOQzzgVP6XooENUHUysmSOsHjbio3F5E4fU=;
 b=S5rtO7EOBR3ZyrvHp2k0vorswD1fOcQr3MbdIxdnGyFu2MNU4Mh7+tsKXVbEYS3omK
 n3h+y9sU1qKzdtmoEa3ImCX2jNrBcXakYp9G0e6QYvrbJsPLWL1Jf6DIoRLhGQCaCLcz
 YVfHP9NRuHYF4OviLTim97mfR5we+TkuawhJV6h3EGmUdZ/2J+37brg/C8iZVYZvOrP0
 fhIm5+FzxGy586wuCvECWb/t8629z0hXjg4eype7ckAMFCRIuUG4mcZZhht6eZaKVVFi
 /WXlVJWMz7v1pJuKapFJSKOpAWKu2jdizYd5y+jKLv8X8EQnjUOmSQwzO+ppmKq7vQu/
 ja6w==
X-Gm-Message-State: AGi0PuZoBXwvZiPLy0y8nWZRH987f/bCrF/H4PO1OlBGZh2YnMZuqOvo
 nW91tI68dbysvRA7rtoc4/2HoLHNxx1Ob0qdWbwSQA==
X-Google-Smtp-Source: APiQypJS8lhYgEXHwHHSl2aUVv20XOZdGQl0zCYJoNbcOKabJyFtPAEETViOm/B58FnDalUl8Z6aaVLkLL0Ja4ce2Ig=
X-Received: by 2002:a92:cb09:: with SMTP id s9mr1142028ilo.182.1586371010854; 
 Wed, 08 Apr 2020 11:36:50 -0700 (PDT)
MIME-Version: 1.0
References: <CANCZdfrRuLf6Q3Q-XzDe5wpSV3XCvkhht2ESh=bXbL6wAtt87g@mail.gmail.com>
 <CAJ9axoQOat+rgZ_69jwwf90NKUbLNuCz1SdjGvA4ufjE07hrGA@mail.gmail.com>
 <CANCZdfpgDt0=BeTg9m+D1CT=R-ioBctO4_M79yt39XrdRHhGzw@mail.gmail.com>
 <CACNAnaEkRf7f-4yKaNo7v=FCXR63qQeS+y-q0+hTuG6-6N_MbQ@mail.gmail.com>
 <CAPyFy2CyY7aVGa0DB4Lue16CrhrDs_o3QoXm8UMt0qajMX4pgQ@mail.gmail.com>
 <CAFMmRNzDdn5J2V2TOB7aAQ-FXoJxwPH+VVy5f5OwQDvtn4Hteg@mail.gmail.com>
In-Reply-To: <CAFMmRNzDdn5J2V2TOB7aAQ-FXoJxwPH+VVy5f5OwQDvtn4Hteg@mail.gmail.com>
From: Ed Maste <emaste@freebsd.org>
Date: Wed, 8 Apr 2020 14:36:38 -0400
Message-ID: <CAPyFy2CUHbiBN5STdGLgxqGafQTi3NUf5Mr_v-A_S75YOqKLuQ@mail.gmail.com>
Subject: Re: Strange commit
To: Ryan Stone <rysto32@gmail.com>
Cc: Kyle Evans <kevans@freebsd.org>, git@freebsd.org
Content-Type: text/plain; charset="UTF-8"
X-Rspamd-Queue-Id: 48yCfr0DzKz4VW6
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.193 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.994,0]; FROM_HAS_DN(0.00)[];
 RCPT_COUNT_THREE(0.00)[3];
 R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17];
 NEURAL_HAM_LONG(-1.00)[-0.998,0]; MIME_GOOD(-0.10)[text/plain];
 MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org];
 TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[];
 RCVD_IN_DNSWL_NONE(0.00)[193.166.85.209.list.dnswl.org : 127.0.5.0];
 IP_SCORE(-0.17)[ip: (-0.00), ipnet: 209.85.128.0/17(-0.40), asn: 15169(-0.43),
 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)[193.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 <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Apr 2020 18:36:53 -0000

On Wed, 8 Apr 2020 at 14:23, Ryan Stone <rysto32@gmail.com> wrote:
>
> I seem to recall a git converter bug fixed many years ago that would
> incorrectly record an MFC as a merge if and only if a new file was
> added to the destination branch, so I would not be surprised if you
> are correct about this.

By "a git converter" do you mean the converter behind the current
https://github.com/freebsd/freebsd conversion, or some other
converter? Because as far as I can tell now the svn2git we have just
doesn't handle mergeinfo at all.