From owner-freebsd-git@freebsd.org Fri Mar 27 17:01:08 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 1CB1327B1F3 for ; Fri, 27 Mar 2020 17:01:08 +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 48pp5m5QRRz3R4l for ; Fri, 27 Mar 2020 17:01:00 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 8010027B1BA; Fri, 27 Mar 2020 17:00:54 +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 7317927B1B9 for ; Fri, 27 Mar 2020 17:00:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) (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 48pp5T14qZz3Qys for ; Fri, 27 Mar 2020 17:00:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f177.google.com with SMTP id g15so9386930ilj.10 for ; Fri, 27 Mar 2020 10:00:43 -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=p3z0DsWhNliSCMTieI1ZZ41HyRMsKHIbj2NUbKZiCP4=; b=dgRn4xWHFy3M75zI/E19SsSlgDMcl7EWg1MbAeSU/Tsk6SVZPZjDHQqFZC76sAHAna wgaPEcL0Tx7lB9d/v2ztn2uhxzHdiLN6MhGRjYnxaJyzJGOXJ+I1qWB1YJLQp1BDtHrD f7lSFlpGcZvNPB27qOh8MFoeihyYDOo6DH2Y1LphQSZshkIQ6bIYYFN80k7yBuuY019T uepuVTdcWRiyfmqLOjZClX2OQAuKGG4Ajrft/XUYkNCoPxuEVaomhxKtBALbhoEgDZv3 bSTIaLNOEt9+GaM6Q8pmR/S8YH70aWQmySc023DjwyWZfIJqYHsIRV1pAqs71eVY4bET L+lg== X-Gm-Message-State: ANhLgQ15c9EbBYowtG5bn/1KJKWpdcNgHeXc6z4mBQqO5O2BCu+BGn6g ucIrV0cZ4UNDt3Hz7e+2tm43aSDO6fFrQiju6+M= X-Google-Smtp-Source: ADFU+vuwV0x6LJ+qooPBHSfJem1rnpX55KdRhl4Hef4KocjcyBuS+6CLnQL22owSeJk51FlJw3HiPypDeKv69A6efbQ= X-Received: by 2002:a92:41c7:: with SMTP id o190mr53244ila.11.1585328435998; Fri, 27 Mar 2020 10:00:35 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Fri, 27 Mar 2020 13:00:23 -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" X-Rspamd-Queue-Id: 48pp5T14qZz3Qys 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.177 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.76 / 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)[177.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.76)[ip: (-7.15), ipnet: 209.85.128.0/17(-1.11), 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)[177.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: Fri, 27 Mar 2020 17:01:08 -0000 On Thu, 26 Mar 2020 at 19:37, Ed Maste wrote: > > 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. Ok, it's not clear to me what is responsible for avoiding merge metadata for these commits. In the hack you referenced: > if (path_from != NULL && prevrepository == repository && prevbranch != branch > && (branch.startsWith("master") || branch.startsWith("head") || > branch.startsWith("projects") || branch.startsWith("user")) > && !prevbranch.startsWith("stable")) { AFAICT the only condition on the "from" branch is that it's not a merge from stable.