From owner-freebsd-git@freebsd.org Tue Mar 10 17:22:09 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 87ECC26AC6B for ; Tue, 10 Mar 2020 17:22:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48cMMz6chnz3N40 for ; Tue, 10 Mar 2020 17:22:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 7283326AC6A; Tue, 10 Mar 2020 17:22:07 +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 71FC326AC68 for ; Tue, 10 Mar 2020 17:22:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) (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 48cMMw6ZSVz3N0R for ; Tue, 10 Mar 2020 17:22:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x841.google.com with SMTP id t13so5378926qtn.13 for ; Tue, 10 Mar 2020 10:22:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=J9sc4+wP3DkvHdwjM2boDan7qLagAkvAVM4HkFDiSww=; b=hZnz1HivO4FPhQSxcq3zgIWMt2dGbWi6P3mPBzCEvnoCcCwcMfOkHC7PPlisRiYExc KXg8oGiiQ5JDxLkELcdWHSwYewuP1i0zkx5kuVZW30l9B66sk/dkJOJauvY0ZlM6pjy4 qo7Gxx7+PFndE6668Kjji1sU8l4sRimfUz1rPlfOYpICLxUpniy19M3B4sXBoj85zGKg u9YyZsQNluC2kzZfahW1Vqo3tW3StCg4+WDx3gw2TbFjs9ltuMm6wN7TsAHhP+9LFCuT GrYl01ozN+xSw6cMPN7MDwY9Ti7tT1PH9IIwB6dJyvBAN0akrt6BN+9GnPr+lH48LaGT fA7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=J9sc4+wP3DkvHdwjM2boDan7qLagAkvAVM4HkFDiSww=; b=oPEg+CQjSBc2JTvBw3czG8CBH9nYnvCnfjaAF4L2qkDvYa0jvnbTECiBZdsAsUMj+B 3t6nlJAG/XA+Zxbqldc3WkC/OWIs+pNkbUaRMKXV/RO5++4HP+AJBNw0m59A2PD/EtlJ omL0OXc2qqWOWd6YLFvuP2w8r8tidPKx0+jm9ifm3GZISLFJlCXiwe9TR2Z/KvmTZSuA athWzlH4yK46lXrjr8a+oR0mD+iAfT+ktBk3buJFP+Qkhb+HbIxJafa/UvB/se2OEjKw qZ6sEwYAFdDWJUOR2noVs39gDhcTiFvv8HFXsbNt7xPP6Oh7rjcD6jJ0/U7gPiFK1reZ o7Lg== X-Gm-Message-State: ANhLgQ14BT3brOg1DDLjvfj+z1yXSThaGjntOqFNppu2y/f9g3mOIRFh zD11gUHWuPN1I9StdxHX+WBsZTI8+D8wMeC3gubJiqepj5A= X-Google-Smtp-Source: ADFU+vtVJ75IED3siaKl0E93abyK4QFkt/YoeEYHL9a2WWw5F0eETwcK7lz/CRelRk/xlOcJLpeLlKtsAGY+WtEjJHI= X-Received: by 2002:ac8:1e08:: with SMTP id n8mr19775795qtl.175.1583860462325; Tue, 10 Mar 2020 10:14:22 -0700 (PDT) MIME-Version: 1.0 From: Warner Losh Date: Tue, 10 Mar 2020 11:14:11 -0600 Message-ID: Subject: Strange commit To: git@freebsd.org X-Rspamd-Queue-Id: 48cMMw6ZSVz3N0R X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=hZnz1Hiv; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::841) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.30 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.995,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.996,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; TO_DN_NONE(0.00)[]; URI_COUNT_ODD(1.00)[3]; RCPT_COUNT_ONE(0.00)[1]; DMARC_NA(0.00)[bsdimp.com]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[1.4.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-0.31)[ip: (2.01), ipnet: 2607:f8b0::/32(-1.85), asn: 15169(-1.65), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Tue, 10 Mar 2020 17:22:10 -0000 >From my github freebsd mirror: commit 48babfba2e3da8bb5457300b288bbf22db3ff646 Author: kevans Date: Tue Aug 14 18:58:01 2018 +0000 MFV r337586: lua: Update to 5.3.5 Bugfix release, nothing too major. Tested with: lualoader via userboot, lualoader live Differential Revision: https://reviews.freebsd.org/D16665 Notes: svn path=/head/; revision=337810 This should be a merge commit, but isn't. Can someone look into it? Warner From owner-freebsd-git@freebsd.org Tue Mar 10 17:30:22 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 8FACD26AED9 for ; Tue, 10 Mar 2020 17:30:22 +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 48cMYT5q5Hz4Cn5 for ; Tue, 10 Mar 2020 17:30:21 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id C5C3226AED1; Tue, 10 Mar 2020 17:30:21 +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 C4CDC26AED0 for ; Tue, 10 Mar 2020 17:30:21 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) (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 48cMYR59QTz4Ck1 for ; Tue, 10 Mar 2020 17:30:19 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f45.google.com with SMTP id v3so7562715iom.13 for ; Tue, 10 Mar 2020 10:30:19 -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=CCk4AOYITdJOuUsv1i/BL0vrstMjX8C2KkJl3lF4PVE=; b=Rhqwy0ZYxQt5/AiZTQ9yJ/h1xVGIu1xkijgiJ+Gy8M0n9v14Lf6wQqNpdsySaQPLNk n7pI1c2pn2SBIEMgs4lO5clmDB2Si4YtBmTLN6txkwR6j4XIe3nYXS7hBq+d23j3QP7X 6wNx8sXcl8pLBYESUNUxp+2Fd6Q0VSlUCVqcDBdPe7tDqv6ZfQsjZr+bMNi9cX1Ry/F8 TXf7tETf1a2yx9oCvJhyuzpkX8naAi68QnC3GZFg690gmtkR8XMMTOFkK1/31MJslkAY HC/dcNMPMFkoD4Civn39/lbWcQuMvHphMbY60dn3DLyiizQV/ZQiXDVaOC7gvizJsNKN Wijg== X-Gm-Message-State: ANhLgQ0dWXz4NXtG/Uz5naaVVKWl04Kw+ouncxOCur8m5Ntu68F9U3SS FSWjuuLyTqlXqA3+kK9AQN/P/dUDrUlPZODYtDgamw== X-Google-Smtp-Source: ADFU+vvWC9fLRa7blFB3zTLzK5Tv6Ja8Qm565Fy/8w5glfeZE+AW483SvDtHMprEhLKg45MOXXYeUPM50a5GaBVQrnw= X-Received: by 2002:a6b:c8d4:: with SMTP id y203mr17595649iof.111.1583861418202; Tue, 10 Mar 2020 10:30:18 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Tue, 10 Mar 2020 13:30:06 -0400 Message-ID: Subject: Re: Strange commit To: Warner Losh Cc: git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48cMYR59QTz4Ck1 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.45 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.79 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; 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]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[45.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.79)[ip: (-4.28), ipnet: 209.85.128.0/17(-2.98), asn: 15169(-1.65), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; 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: Tue, 10 Mar 2020 17:30:22 -0000 On Tue, 10 Mar 2020 at 13:22, Warner Losh wrote: > > From my github freebsd mirror: > > commit 48babfba2e3da8bb5457300b288bbf22db3ff646 > Author: kevans > Date: Tue Aug 14 18:58:01 2018 +0000 > > MFV r337586: lua: Update to 5.3.5 > > Bugfix release, nothing too major. > > Tested with: lualoader via userboot, lualoader live > Differential Revision: https://reviews.freebsd.org/D16665 > > Notes: > svn path=/head/; revision=337810 With a quick look it seems there are several cases - I tried git log --no-merges -i --grep 'update to' From owner-freebsd-git@freebsd.org Wed Mar 11 16:31:20 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 BBDF6264FBB for ; Wed, 11 Mar 2020 16:31:20 +0000 (UTC) (envelope-from uspoerlein@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 48cyBv531jz3JDj for ; Wed, 11 Mar 2020 16:31:19 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 6BF1B264FB3; Wed, 11 Mar 2020 16:31:19 +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 6B408264FB2 for ; Wed, 11 Mar 2020 16:31:19 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) (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 48cyBv0NB1z3JCc; Wed, 11 Mar 2020 16:31:18 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f45.google.com with SMTP id v22so2616304otq.11; Wed, 11 Mar 2020 09:31:18 -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=VuW0jE5Vbj9tJh6GrqKnQ1bdKd7BXuUWDAoYukLqdFY=; b=UcqbmOuCVMHbcs5Wfyb2jhL9jkczzcnB8apdUnfKpqyJYbEDcZgqsaBRNIYKgcPwzO x/d0hLi76eWDjwVDQdzwaslbRgPqig4bWZ2kOr+p6vji0AjWYkdKamxtFPxFQiIJepgQ eDYO7iBtckQDmf99sdJWtZWrHHsb5JthYCmdFvJTWs+odPVDyDzCPnRXLJ2kb+hiclTO ofqtgyDin5h7WaRifv5Q3A/vI1tH7VpBRtOzLe2JJAY/iZOp1EKys25Ykx3GcWS6z0jf dET6vxdNLpeTO7ZUdJYY65XDsjBgpMft79KCmtlV20r8LK7S7JM9/lv40AfJZBxHR1Vo MQ6w== X-Gm-Message-State: ANhLgQ2ZGkHHnCJ/H8Qj66lvp9SgttuWIHBkUcn/T+xo6tjC+kj8yKx3 9vjJFLHboYMoPdatD62r2j5edM8/7Ehf3lHQr5D/WA== X-Google-Smtp-Source: ADFU+vsMG3Y61nUrYJ/M9vtZdwz3KyMKVvZlV2QdkmXWRnLk0dldR7qiKl5n1NMqli5GSfHNi9yt5PUb0k7ZQVDY9Uc= X-Received: by 2002:a9d:6ad9:: with SMTP id m25mr3080019otq.119.1583944277152; Wed, 11 Mar 2020 09:31:17 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Wed, 11 Mar 2020 17:31:06 +0100 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: Warner Losh , git@freebsd.org X-Rspamd-Queue-Id: 48cyBv0NB1z3JCc X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-5.99 / 15.00]; NEURAL_HAM_MEDIUM(-0.99)[-0.992,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Wed, 11 Mar 2020 16:31:20 -0000 Am Di., 10. M=C3=A4rz 2020 um 18:30 Uhr schrieb Ed Maste : > On Tue, 10 Mar 2020 at 13:22, Warner Losh wrote: > > > > From my github freebsd mirror: > > > > commit 48babfba2e3da8bb5457300b288bbf22db3ff646 > > Author: kevans > > Date: Tue Aug 14 18:58:01 2018 +0000 > > > > MFV r337586: lua: Update to 5.3.5 > > > > Bugfix release, nothing too major. > > > > Tested with: lualoader via userboot, lualoader live > > Differential Revision: https://reviews.freebsd.org/D16665 > > > > Notes: > > svn path=3D/head/; revision=3D337810 > > With a quick look it seems there are several cases - I tried > git log --no-merges -i --grep 'update to' > This is intentional, please see https://github.com/freebsd/svn2git/blob/1a0b3e0230e1b2430e5d8eb91ac99aeff5a= 1614d/src/svn.cpp#L883 Only projects and user branches are represented as merges to master, as they usually have a full tree. This seemed to match the git model better (as opposed to the SVN model). Not sure whether we really want to handle these "code drops" as proper git merge commits. I fear what that might do to the history ...