From owner-freebsd-git@freebsd.org Wed Feb 17 16:32:11 2021 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 73E0D54910F for ; Wed, 17 Feb 2021 16:32:11 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4DgjzZ5Q4Nz3pCN for ; Wed, 17 Feb 2021 16:32:10 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f179.google.com with SMTP id e7so11817185ile.7 for ; Wed, 17 Feb 2021 08:32:10 -0800 (PST) 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=zVHa0IvK/UiqXNwVDKOkv4WZZm3cIGxu7ca1i+ka2Ys=; b=rAPdXZgk7cIzwWrqSD827oMrdAeVgUmXHuULNoFaa/sC4YlTt6nIEk5EEmqm4dSzuS NhRl13NBFdInCw7DvbJ/K8rvXAcY12N0V2P6JMMZoLFFZ4VgH8Vb0EsofejWtoKgZthG 024uJyvlJgIm5U/TND4VOeejydKhpYnO6KnzpuZG+Zme530c/fjTojJCpDa7dKmchTMv QI3JASDw06bi+eJWtV5So9eymEBILzt/F2tiaDSi6JpHs0tAQnVDZu8R0D2AB0tFO6+S GowycZIlrj2fNGbHTOG8TzF6hR8IniqKoZ46grk7LimcYPY0nvujzmvjO2Rj6c9DKm3X dUjA== X-Gm-Message-State: AOAM532K5lLNAc2lQfNFc+vXi9m+IGLjmqBGCzCbMxU7wmnnCOMsHXFI Weobu/P7JLZsxlhv+RyYaFdPqptFxY67YYIldcH0TmkR6c+rXw== X-Google-Smtp-Source: ABdhPJxugJYlrPYP+Qy8x3OasCP6Bx06+HYLYNO3v9CuBBUbojGJ5EGVJdiTkYBxLWvaybvJjqMEn9goK3XA/mfNEG8= X-Received: by 2002:a92:ab10:: with SMTP id v16mr21746998ilh.100.1613579528790; Wed, 17 Feb 2021 08:32:08 -0800 (PST) MIME-Version: 1.0 From: Ed Maste Date: Wed, 17 Feb 2021 11:31:29 -0500 Message-ID: Subject: Adopting "Fixes" trailer To: freebsd-git X-Rspamd-Queue-Id: 4DgjzZ5Q4Nz3pCN 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.179 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.998]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.179:from]; 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]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[carpeddiem]; R_DKIM_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[209.85.166.179:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.179:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.179:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 17 Feb 2021 16:32:11 -0000 In review D28693 I've proposed adding a "Fixes" trailer to the commit message template. It is used to identify a commit that is a follow-up bug fix to a previous commit, and could generally be used instead of "MFC with" or "X-MFC-with". One nice aspect is that it conveys fix metadata also for commits that aren't intended for MFC, which may be useful for downstream projects. Fixes is already used by a number of other projects. I have proposed adding to the template # Fixes: Please follow up here or in the review with any comments. I'll commit in a few days if there are no objections. https://reviews.freebsd.org/D28693 From owner-freebsd-git@freebsd.org Wed Feb 17 23:53:51 2021 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 EC66D53C839 for ; Wed, 17 Feb 2021 23:53:51 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4DgvnB4cPwz3wRB for ; Wed, 17 Feb 2021 23:53:50 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f42.google.com with SMTP id u8so142551ior.13 for ; Wed, 17 Feb 2021 15:53:50 -0800 (PST) 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=v4jQqs4d8DHSezAkvO3NTIJrE0nQzMqTngnFzYou9GA=; b=bc0B4yImolGgDyBTQMUH0J+3T3Iz929z+caMtXXiNwUtg+nek9X5hTgO+kgcifOGtg t1swgry+IlJlTAVo+WZQzo/Lx657iGmmTe6gqYdkgPltUqleSoRYViLTpK0+HBGa8LY3 NIUAlE245XLPFXkK8g8uCym2lt7jUZbCVqCloEdfA/9IHl38bZgJEuwOXdLVsmHalEgr ViF0rYJXuhKDnp6wKhuZ5j1AyZSRmeaNV+bcSvTWsSxg7f32f7o6U93ClduXU45Jtye+ ZYPSELPNjH0hkJ2YkijKNd3XExp7Y7wGEKtwoInlavaQZ5eVhTTIgBneo2ISXmJ0RXU1 H+Hw== X-Gm-Message-State: AOAM530TUoEHzGtfmZHbU5ujWd2QAN4Knxszxn9bVhRruJXksZiJbiUx FlSCgoIJmOuvMXFby48MV+LzWEGqzbLN3T0YMdzdq5fdev17Cw== X-Google-Smtp-Source: ABdhPJw8xQ9lCzVborxTApKVVUIcu+TqV1T+Ykasn0OQB9COIC6jpqHfewFZqB//e+5E0QjVj68xtxRHpij8sJ5ymNU= X-Received: by 2002:a02:634b:: with SMTP id j72mr1904204jac.106.1613606028256; Wed, 17 Feb 2021 15:53:48 -0800 (PST) MIME-Version: 1.0 From: Ed Maste Date: Wed, 17 Feb 2021 18:53:07 -0500 Message-ID: Subject: gitrepo warning upon push To: freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4DgvnB4cPwz3wRB 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.42 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.42:from]; 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]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[carpeddiem]; R_DKIM_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[209.85.166.42:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.42:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.42:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 17 Feb 2021 23:53:52 -0000 It looks like we have some cleanup that needs to be automated. % git push freebsd stable/12 ... remote: warning: The last gc run reported the following. Please correct the root cause remote: and remove gc.log. remote: Automatic cleanup will not be performed until the file is removed. remote: remote: warning: There are too many unreachable loose objects; run 'git prune' to remove them. remote: From owner-freebsd-git@freebsd.org Thu Feb 18 00:44:53 2021 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 2E15753F96E for ; Thu, 18 Feb 2021 00:44:53 +0000 (UTC) (envelope-from mike@sentex.net) Received: from pyroxene2a.sentex.ca (pyroxene19.sentex.ca [IPv6:2607:f3e0:0:3::19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "pyroxene.sentex.ca", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dgww43HJ9z4VBl; Thu, 18 Feb 2021 00:44:52 +0000 (UTC) (envelope-from mike@sentex.net) Received: from [IPv6:2607:f3e0:0:4:24d0:cb23:a2ec:9f4a] ([IPv6:2607:f3e0:0:4:24d0:cb23:a2ec:9f4a]) by pyroxene2a.sentex.ca (8.15.2/8.15.2) with ESMTPS id 11I0ipfm054246 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO); Wed, 17 Feb 2021 19:44:51 -0500 (EST) (envelope-from mike@sentex.net) Subject: Re: gitrepo warning upon push To: Ed Maste , freebsd-git References: From: mike tancsa Message-ID: <5b6e1fd1-1aa6-9031-78df-9dab1f05b21a@sentex.net> Date: Wed, 17 Feb 2021 19:44:52 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Queue-Id: 4Dgww43HJ9z4VBl X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of mike@sentex.net designates 2607:f3e0:0:3::19 as permitted sender) smtp.mailfrom=mike@sentex.net X-Spamd-Result: default: False [-2.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f3e0:0:3::19:from]; FREEFALL_USER(0.00)[mike]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HFILTER_HELO_IP_A(1.00)[pyroxene2a.sentex.ca]; HFILTER_HELO_NORES_A_OR_MX(0.30)[pyroxene2a.sentex.ca]; R_SPF_ALLOW(-0.20)[+ip6:2607:f3e0::/32]; SPAMHAUS_ZRD(0.00)[2607:f3e0:0:3::19:from:127.0.2.255]; ARC_NA(0.00)[]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; DMARC_NA(0.00)[sentex.net]; NEURAL_HAM_SHORT(-1.00)[-0.999]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:11647, ipnet:2607:f3e0::/32, country:CA]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 18 Feb 2021 00:44:53 -0000 Hi Ed,     Would this have the side effect of halting git to svn merges ?  The last update to the svn repo for RELENG12 was # svnlite update Updating '.': At revision 369282. which is ~ 28hr ago (before the openssl mfc)     ---Mike On 2/17/2021 6:53 PM, Ed Maste wrote: > It looks like we have some cleanup that needs to be automated. > > % git push freebsd stable/12 > ... > remote: warning: The last gc run reported the following. Please > correct the root cause > remote: and remove gc.log. > remote: Automatic cleanup will not be performed until the file is removed. > remote: > remote: warning: There are too many unreachable loose objects; run > 'git prune' to remove them. > remote: > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Thu Feb 18 16:53:12 2021 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 1675353FC66 for ; Thu, 18 Feb 2021 16:53:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DhLPN09Cvz4p1x; Thu, 18 Feb 2021 16:53:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (unknown [IPv6:2601:648:8681:1cb0:f03d:5bcf:93a2:4bfa]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id A390E7E9F; Thu, 18 Feb 2021 16:53:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: Adopting "Fixes" trailer To: Ed Maste , freebsd-git References: From: John Baldwin Message-ID: <75c9ad1e-c7ca-8a22-cfe5-6434b3685ccc@FreeBSD.org> Date: Thu, 18 Feb 2021 08:53:09 -0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 18 Feb 2021 16:53:12 -0000 On 2/17/21 8:31 AM, Ed Maste wrote: > In review D28693 I've proposed adding a "Fixes" trailer to the commit > message template. It is used to identify a commit that is a follow-up bug > fix to a previous commit, and could generally be used instead of "MFC with" > or "X-MFC-with". One nice aspect is that it conveys fix metadata also for > commits that aren't intended for MFC, which may be useful for downstream > projects. > > Fixes is already used by a number of other projects. I have proposed adding > to the template > # Fixes: > > Please follow up here or in the review with any comments. I'll commit in a > few days if there are no objections. > > https://reviews.freebsd.org/D28693 Huh, at first I thought this was to auto-close issues on GitHub. I think this is a good idea. If we had a wrapper script for MFC's it could auto-squash those as an option perhaps. -- John Baldwin From owner-freebsd-git@freebsd.org Thu Feb 18 19:31:21 2021 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 E5DDA5472EF for ; Thu, 18 Feb 2021 19:31:21 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4DhPvs6BJnz3LKb; Thu, 18 Feb 2021 19:31:21 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f49.google.com with SMTP id q7so3250022iob.0; Thu, 18 Feb 2021 11:31:21 -0800 (PST) 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=OeCWF8VS71TlJ0z6c6gf8bRlnC6gFJZzLD4FFhQlskI=; b=cTU4Ug2FIrZeeZoMIb5Rsg9d7RPd9Pd1kVMYgyUjdmrfuqfYIkYVVGgx9xj06COYNE qLWslKysb5ksO8yzcQQkpRWqKCwjwJ6NG+n+zVV6rMeF64+q4+0Gs691Fh5ttC9Ib1OY 6xuh2K7g3mu9lNLK921vhaGBrPAyDRAkw9RQTC9xhOtVWZI4TDIKj9bcVo3JY02DUYLy x37OI0AOvMBzQNV338vuLWP+1sfiIdd/2hcLV6yRTeA6cGOv58n03Ju6MktEShbh4mMN ZqOGq/zN0+GeASOZC+i6yC2WNbfXGL0GucyXEoZovbrMYXA3u/1H+EUWvdctAMSZ6KB0 F5Fw== X-Gm-Message-State: AOAM533atkbYz3p30i+sowdLjMqVq/K6xkffg0tQ7GZl2HaaWM1JOMis qSAMiEe7VthcQrgBLQmFg5ksYpMsabLMwpBpRyG4+GBX7LgfLw== X-Google-Smtp-Source: ABdhPJyDQcGMMHgMpaxYSW/i+swWdvUZN50Ev+Cw9ktQaLXtEusrLYUb70QNl8DuMRnkgIVPsr9gbGpggO33QWrpWSE= X-Received: by 2002:a02:634b:: with SMTP id j72mr6021110jac.106.1613676679837; Thu, 18 Feb 2021 11:31:19 -0800 (PST) MIME-Version: 1.0 References: <75c9ad1e-c7ca-8a22-cfe5-6434b3685ccc@FreeBSD.org> In-Reply-To: <75c9ad1e-c7ca-8a22-cfe5-6434b3685ccc@FreeBSD.org> From: Ed Maste Date: Thu, 18 Feb 2021 14:30:34 -0500 Message-ID: Subject: Re: Adopting "Fixes" trailer To: John Baldwin Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4DhPvs6BJnz3LKb X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 18 Feb 2021 19:31:22 -0000 On Thu, 18 Feb 2021 at 11:53, John Baldwin wrote: > > > https://reviews.freebsd.org/D28693 > > Huh, at first I thought this was to auto-close issues on GitHub. I think > this is a good idea. If we had a wrapper script for MFC's it could > auto-squash those as an option perhaps. Ah, I think that's typically "Closes: " Indeed we could search for Fixes in an MFC wrapper; the MFC reminder mails and https://gitmfc.kernelnomicon.org could also be extended to list related Fixes commits. From owner-freebsd-git@freebsd.org Thu Feb 18 20:30:28 2021 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 816B754D199; Thu, 18 Feb 2021 20:30:28 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4DhRD43DNVz3hXT; Thu, 18 Feb 2021 20:30:28 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f178.google.com with SMTP id a16so2647427ilq.5; Thu, 18 Feb 2021 12:30:28 -0800 (PST) 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=G+MJoeXlnZYcO0G4Mv1rS1SvfGjUyuE4p2H2E6/1clQ=; b=m6LaEW603uDiWf14/5lfeSI4IO0Dr9LKe+uhCwmGW/wf4CG9F6TtXokgJpb+wyT4jf Qj/4xvd+FQecALg+vDME1Ag8PzZW1X1k/P0bVLbbHFkGc6ZvhZWEybVPahH0ZyJY5yTE CvmZQB9r+fN6CugAtS5Zmpyq56Pl1spMXXBbM0rVyDd/3Qh0qMROV0OYF25nRvfixwhN rx5NHWirGribuWz3jNxXigESiwXbdHw3SbBRp6OJh+E5VXwi0LEcsitlrn3VXp2rVExm 60by0OolLYWDHMJx2XNuUjisxj/vmuISjQ80PUqK9J2Y105FDvYyrWIHYfFvjlRP1nKc mqkQ== X-Gm-Message-State: AOAM532SzjAuSTrErAJHwe+dFffGHBKqEJlpvHf7upfbIYq/mWCNI57Y C+rEbkDsvFl35cuorLH+XDYkVx0bVUSwKKr9tNJ0W1SaMb41ow== X-Google-Smtp-Source: ABdhPJzi7geAXw9xlh5yFC7XTtnWrVPtpDd7SVcT6lRqGXlsG0W/phBCqFuD6XAwt1JyylnLS15Q9ZiK+hQmLCzWfAM= X-Received: by 2002:a92:ab10:: with SMTP id v16mr904086ilh.100.1613680226895; Thu, 18 Feb 2021 12:30:26 -0800 (PST) MIME-Version: 1.0 References: <5b6e1fd1-1aa6-9031-78df-9dab1f05b21a@sentex.net> In-Reply-To: <5b6e1fd1-1aa6-9031-78df-9dab1f05b21a@sentex.net> From: Ed Maste Date: Thu, 18 Feb 2021 15:29:42 -0500 Message-ID: Subject: stable/12 git -> svn mirror delayed To: freebsd-stable stable Cc: freebsd-git , mike tancsa , Warner Losh Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4DhRD43DNVz3hXT X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 18 Feb 2021 20:30:28 -0000 The git-svn stable/12 mirror is currently stuck. It encountered an issue with the OpenSSL 1.1.1j import (e3a8c0df593b) and hasn't been able to make progress past it. It's under investigation and will hopefully be resolved soon. (I think the git-svn converter is trying to cherry-pick each of the vendor updates on the branch 4f55bd5321b7 rather than a single commit for the merge itself.) From owner-freebsd-git@freebsd.org Thu Feb 18 20:45:26 2021 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 ACC2554DF8A for ; Thu, 18 Feb 2021 20:45:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2a.google.com (mail-qv1-xf2a.google.com [IPv6:2607:f8b0:4864:20::f2a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4DhRYK4gm4z3kRv for ; Thu, 18 Feb 2021 20:45:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2a.google.com with SMTP id q8so1597925qvx.11 for ; Thu, 18 Feb 2021 12:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YGUP3S9UHiYcyIRfVbsnITPxJj91y2EVs4nI9w+ipyE=; b=YecM1XExvBILgCfdVf8OTVo5JaFcTglMmJdz7sstvw+ETJ2wthrzKpHPbVGQe8C+gs 22PMeHaGvlJlkjWcIiVi2obUluzIxdWM235QrPpzGqhgbwjJlhgx+EcBeVkPX1X7Fq/F t/Ryy1wASphfEYVE2NZB/NR/7F01XAvaZyjtGwNOevp0H118VdsHy2U5ykhmDcQX8jNW aJl1aE2WVjfBufl+Y9rilBMb/jXsAyoXLnLWxDf8qhCp7/FNNqBXTa20MZRIH7h8uVLC ihLn1+8/QXgQ24E34gI/O/ZaTGVKpNiUv5k9JAV9gf8xikp7aXOeyhluBBKySkoETtma Abyg== 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=YGUP3S9UHiYcyIRfVbsnITPxJj91y2EVs4nI9w+ipyE=; b=H8HksNH0wgcfAh9ZDZew47DNaCUNNYmnF9vawd/3i7e1SCTK4HTO0QRZaS7HDBNfu8 mpYMeL+sYdxDGcOrYMa9OTpq2dU5LhhWv3YE7F/5eWoR4XJa89o60g+sE50l2twhkGyz bnF404VJM7hTUThu5iG9EuUKNd9s1p25aYN0URAGNNjeqaTzXFgk8YPR2zjvvHllbEtE NgkPv7zNHoTyhGn9G8hlM+M9GRX5uasuhsOxLF3UfKja+/01SKxcUIFvVAQvO+pjAcPH nzWKWLAxdgE/baKR5OtioOyUo8wpHEwjuJInsmx72ZJ18gv7gTKjODi4iLqtTNPwUtMb bdhg== X-Gm-Message-State: AOAM532/nQztnYtjyQP7PD848VTPPJZ/CRIRy7JYEXn2v+yUaFiFbZtv q+xmKcp6mU0HotITOM5PswyxQAhXF9/+aTC/BJtxNA== X-Google-Smtp-Source: ABdhPJwJ//QZebBTY5ozd0QcL5ZQeKgUIIef4oC/9iqAd0vPye8y/cYRFVLK4UjDMoCoM811TX2QNyJsL5YKifABFMs= X-Received: by 2002:a0c:abce:: with SMTP id k14mr5874979qvb.23.1613681124544; Thu, 18 Feb 2021 12:45:24 -0800 (PST) MIME-Version: 1.0 References: <5b6e1fd1-1aa6-9031-78df-9dab1f05b21a@sentex.net> In-Reply-To: From: Warner Losh Date: Thu, 18 Feb 2021 13:45:13 -0700 Message-ID: Subject: Re: stable/12 git -> svn mirror delayed To: Ed Maste Cc: freebsd-stable stable , freebsd-git , mike tancsa X-Rspamd-Queue-Id: 4DhRYK4gm4z3kRv X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=YecM1XEx; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f2a:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2a:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f2a:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 18 Feb 2021 20:45:26 -0000 The problem is that it was a merge commit, which should have been administratively prohibited. A merge commit from main to stable/* is never the right thing. It creates problems, not least of which is the issue with the subversion exporter. In this case, it won't create the more severe issues like we have in the converted past, so that's at least something. I wrote the script assuming there'd never be a merge commit. I'll fix things by hand for this one commit which will get things going again. Making this exporter handle merge commits generically is tricky and beyond the scope of the work I took on... Hopefully, we'll get the commit hook problem fixed soon so it won't happen again. Warner On Thu, Feb 18, 2021 at 1:30 PM Ed Maste wrote: > The git-svn stable/12 mirror is currently stuck. It encountered an > issue with the OpenSSL 1.1.1j import (e3a8c0df593b) and hasn't been > able to make progress past it. It's under investigation and will > hopefully be resolved soon. > > (I think the git-svn converter is trying to cherry-pick each of the > vendor updates on the branch 4f55bd5321b7 rather than a single commit > for the merge itself.) > From owner-freebsd-git@freebsd.org Thu Feb 18 23:40:27 2021 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 F1AC352E708; Thu, 18 Feb 2021 23:40:27 +0000 (UTC) (envelope-from mike@sentex.net) Received: from pyroxene2a.sentex.ca (pyroxene19.sentex.ca [IPv6:2607:f3e0:0:3::19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "pyroxene.sentex.ca", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DhWRH6DkPz4W31; Thu, 18 Feb 2021 23:40:27 +0000 (UTC) (envelope-from mike@sentex.net) Received: from [IPv6:2607:f3e0:0:4:54d3:fc57:f2db:7232] ([IPv6:2607:f3e0:0:4:54d3:fc57:f2db:7232]) by pyroxene2a.sentex.ca (8.15.2/8.15.2) with ESMTPS id 11INeQ1L072249 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO); Thu, 18 Feb 2021 18:40:26 -0500 (EST) (envelope-from mike@sentex.net) Subject: Re: stable/12 git -> svn mirror delayed To: Warner Losh , Ed Maste Cc: freebsd-stable stable , freebsd-git References: <5b6e1fd1-1aa6-9031-78df-9dab1f05b21a@sentex.net> From: mike tancsa Message-ID: <2e162938-a5e1-bf0e-8cbd-acf24a5f121d@sentex.net> Date: Thu, 18 Feb 2021 18:40:26 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Queue-Id: 4DhWRH6DkPz4W31 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 18 Feb 2021 23:40:28 -0000 Thanks guys for the explanation / looking into it!   And thank you very much for all your efforts on this big move to git!      ---Mike On 2/18/2021 3:45 PM, Warner Losh wrote: > The problem is that it was a merge commit, which should have been > administratively prohibited. A merge commit from main to stable/* is > never the right thing. It creates problems, not least of which is the > issue with the subversion exporter. In this case, it won't create the > more severe issues like we have in the converted past, so that's at > least something. > > I wrote the script assuming there'd never be a merge commit. I'll fix > things by hand for this one commit which will get things going again. > Making this exporter handle merge commits generically is tricky and > beyond the scope of the work I took on...  Hopefully, we'll get the > commit hook problem fixed soon so it won't happen again. > > Warner > > On Thu, Feb 18, 2021 at 1:30 PM Ed Maste > wrote: > > The git-svn stable/12 mirror is currently stuck. It encountered an > issue with the OpenSSL 1.1.1j import (e3a8c0df593b) and hasn't been > able to make progress past it. It's under investigation and will > hopefully be resolved soon. > > (I think the git-svn converter is trying to cherry-pick each of the > vendor updates on the branch 4f55bd5321b7 rather than a single commit > for the merge itself.) > From owner-freebsd-git@freebsd.org Fri Feb 19 00:03:42 2021 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 732F452FD3C for ; Fri, 19 Feb 2021 00:03:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4DhWy62SS3z4YM0 for ; Fri, 19 Feb 2021 00:03:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72a.google.com with SMTP id f17so4044616qkl.5 for ; Thu, 18 Feb 2021 16:03:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=vCmEX3/FJimn3utv3vqLB7JOZRg/H5gTsP85KY3VMYg=; b=xEQmjuVtnH5TzgTVuTfRbIt7UvkE3IfcovGXyAxwSXG8Ise8mbmwEZVWOTud5qdmlv R3VXQ03kCzr6Kd/XN77bIAgd5l/lPlk8zVqYJpplv88k5p6lEBuckZm/bR2ZGXLBlpFK lVTZnNwl9tXptM43vB8t+H6WlYrbRvcuZxu/ZasRvGFtWgFl37lYLvhaN5v0MGuw4l1g 9pdPXAXSj52eYDOUpEYZGbiAqvMMykFnpVjuznP/IBYi0b2obYCs8ibG2i4CrJ9ViL73 lNePgoT/wSNOev6cOTtruqXb1CDuYWjIqEct4mOLbn6yt/G+3Kf/c2KxXNyRKwxQLJL+ inHQ== 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=vCmEX3/FJimn3utv3vqLB7JOZRg/H5gTsP85KY3VMYg=; b=UIhvzIl86EPpZBIr3QvsibxY1hibcAy64h5uX5DMlbj7n2cp0yOgnfYvTS2c2sC8Rs CbFIYjK3tpmKaTiismlaz32+VBVFlXSq6Xs4WW3VUTLGOT1HPRU5oFB4DwCknPm7RxXD HUwgRYAlVtybZF3nSNriop/RyvKsFI7v2SZb4e7nlRC3Q+bXkPK9MpCSW1TCMIBRlHi4 WRrHxdpXaHjaHqBpHl9jYurbi0b1+KF5J3alZUVRRnHt4NL2eUS3pzfdmt3EKR6CCd6B 17X8kaZFUFD0wzhP0as14TCwlthB6SbhYJSyj2sABI4sO0ndKmOsHd4HElSAeoMKTmcD J9iQ== X-Gm-Message-State: AOAM533faXS2xmnhulZyj8EgGjQm8rfcAb0U27cePoBivUlUgI7tIma9 /73q1m1Ih/cpjUi2xMt4vLuxWS+fcWiOGCw8zWyvzA== X-Google-Smtp-Source: ABdhPJwm55C0aB5AYEqWyqrCM/U1JpVnX6XeJcAvs31WWe+ZLfuVjHb17OEM7vHOQ7k/DRNo4u41Rw4vfH1QW+r0tro= X-Received: by 2002:a05:620a:12d1:: with SMTP id e17mr6899203qkl.89.1613693021419; Thu, 18 Feb 2021 16:03:41 -0800 (PST) MIME-Version: 1.0 References: <5b6e1fd1-1aa6-9031-78df-9dab1f05b21a@sentex.net> <2e162938-a5e1-bf0e-8cbd-acf24a5f121d@sentex.net> In-Reply-To: <2e162938-a5e1-bf0e-8cbd-acf24a5f121d@sentex.net> From: Warner Losh Date: Thu, 18 Feb 2021 17:03:30 -0700 Message-ID: Subject: Re: stable/12 git -> svn mirror delayed To: mike tancsa Cc: Ed Maste , freebsd-stable stable , freebsd-git X-Rspamd-Queue-Id: 4DhWy62SS3z4YM0 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 19 Feb 2021 00:03:42 -0000 I've done a dry-run that looks good (at first blush, I still need to look at it in more detail). I've put a workaround into the conversion script that will fix this issue (and any others that are just like it that slip through), but is definitely hackish and not generic for all possible ways that a merge commit could land. When I'm satisfied, I'll have the automated mirroring re-enabled and we should be good, though it may be a few hours due to time zones, etc. Warner On Thu, Feb 18, 2021 at 4:40 PM mike tancsa wrote: > Thanks guys for the explanation / looking into it! And thank you very > much for all your efforts on this big move to git! > > ---Mike > > On 2/18/2021 3:45 PM, Warner Losh wrote: > > The problem is that it was a merge commit, which should have been > > administratively prohibited. A merge commit from main to stable/* is > > never the right thing. It creates problems, not least of which is the > > issue with the subversion exporter. In this case, it won't create the > > more severe issues like we have in the converted past, so that's at > > least something. > > > > I wrote the script assuming there'd never be a merge commit. I'll fix > > things by hand for this one commit which will get things going again. > > Making this exporter handle merge commits generically is tricky and > > beyond the scope of the work I took on... Hopefully, we'll get the > > commit hook problem fixed soon so it won't happen again. > > > > Warner > > > > On Thu, Feb 18, 2021 at 1:30 PM Ed Maste > > wrote: > > > > The git-svn stable/12 mirror is currently stuck. It encountered an > > issue with the OpenSSL 1.1.1j import (e3a8c0df593b) and hasn't been > > able to make progress past it. It's under investigation and will > > hopefully be resolved soon. > > > > (I think the git-svn converter is trying to cherry-pick each of the > > vendor updates on the branch 4f55bd5321b7 rather than a single commit > > for the merge itself.) > > > From owner-freebsd-git@freebsd.org Sat Feb 20 04:36:29 2021 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 63CB353504C for ; Sat, 20 Feb 2021 04:36:29 +0000 (UTC) (envelope-from debdrup@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4DjFyP1w3lz4gDP for ; Sat, 20 Feb 2021 04:36:29 +0000 (UTC) (envelope-from debdrup@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 3F559534EFC; Sat, 20 Feb 2021 04:36:29 +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 3F12B53504B for ; Sat, 20 Feb 2021 04:36:29 +0000 (UTC) (envelope-from debdrup@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DjFyP17TYz4gDN for ; Sat, 20 Feb 2021 04:36:29 +0000 (UTC) (envelope-from debdrup@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1613795789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Z3o1iu2EhMYjXRQSck4ODp+4w1jIVoUPm0PHu5+UO5Q=; b=DCDvM5hHy57o/+c2toOQw5KkghNKGldMsVGjDqk5GZM3oBMZ0DARHUr1F1Q6eDfIpdoYIS agt+oC0KNuqL0ZOb7CypqSunjinlLeiQGvPV2g9Z1X57JDGvx3PMcavX4+HlWtG7DAIXPK SB+9deKx90a+Ky5P7C6gbfSkuB2DWx2uARYoBR/iQdJeWOjMiPJlgbupv4hFXnjqP3F7OO OCLsrjo/ZADpqhRlCsYbQiptOUHdd6s+7BjM0yOPwDkp0xt1GqFifHWnR55VGpb5yRNTlq oJky31MeZhdXnPKkaC2rJi22x6w3FD9GdZ5OzJPdWXZEe4bAm2lGX8HGfCxxcQ== Received: by freefall.freebsd.org (Postfix, from userid 1471) id 1E923103B7; Sat, 20 Feb 2021 04:36:29 +0000 (UTC) Date: Sat, 20 Feb 2021 05:36:27 +0100 From: Daniel Ebdrup Jensen To: git@FreeBSD.org Subject: Regarding commit notifications Message-ID: <20210220043627.ouvbirq4n2elmjdk@nerd-thinkpad.local> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wztelnjtf2gvf2fg" Content-Disposition: inline ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1613795789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Z3o1iu2EhMYjXRQSck4ODp+4w1jIVoUPm0PHu5+UO5Q=; b=KigZ1iNAVIWRHhvSSgl0VHVO4AvWKQi2j1a0v7C/rYixDQPz4/yBP88fo6LSGJ6qTm+2l8 ICPpqIr/Yv3gCcPZt0xZBUJ0wro/Pox4yoJrah8BcLs2n/UmisIk84LraHv8EQgHhW5jmf qop93rcvDv1sYeSlO2+NYk6+DKvJgyS5N0pPcmuaR+QD96ylzGCU7/yPjWyEes2V/ERrTD mUfgQgXoRo1gENTBo3FDEc7hhuhKcl0vYaj6W4YKZutxLNC2vwY+aQx3oBruiF3sYOPAmg ziOqLfatwupnIijboTz2JbxWCRIxoqmirFzeCqZEcnmk6Qc68USHtR4vJNgoyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1613795789; a=rsa-sha256; cv=none; b=eTrUDVUDDfRla1FUxDN9zOMDRTco4elNtRS4vxeATT4JZq5BJuBVrWSrin8jGSseXWiAj6 9KM4kWb+oe7rBmMpydYMI48R45OWThFQ1DPIi9be8yTKAX4n4ui3EePAZSzRzlwqQUeh+E q7LON/QbiDK1CHxLOkMHTjpy6Q40iqarNo5H3aWQuSaMzO3BaJQqcH+c9CiVoIl8N6/hoA LauiEeOH6GybHMYBZqQVdCIyXx5uRdzqZDVAP4WBDGuZj+L2YtJ6hldW4N5m52qrmPQYJE mMAa5CMuS6htp+ss8nnO/OYUPCC0yKPnHl6cL2WxMVpsQNNcaWRlJRl4Kac6jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sat, 20 Feb 2021 04:36:29 -0000 --wztelnjtf2gvf2fg Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Hi folks, I had a thought the other day, that it would be nice if the subject message sent to src-commiters and doc-commiters (and the branch-specific mailing lists) included the repo in question. For example, a mail sent to doc-commiters looked something like this git: - doc/main - Ie. the only thing that's added is the "doc/" part. I already mentioned this in #gitcvt on EFnet, but jhb@ asked me to send it in as an email. jhb@ also pointed out that there are mail-headers, which I wasn't aware of, but I still think it would be great to have it in the subject. :) Naturally, this doesn't need to go to the top of the TODO list ;) Yours, Daniel Ebdrup Jensen --wztelnjtf2gvf2fg Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEDonNJPbg/JLIMoS6Ps5hSHzN87oFAmAwkcpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDBF ODlDRDI0RjZFMEZDOTJDODMyODRCQTNFQ0U2MTQ4N0NDREYzQkEACgkQPs5hSHzN 87oLHwgAgBpWK95fmzfBDt2U+aoDNfN6mOv/W4lx/pbIGIb39FLT2vmcpQdtv8Xj rE8emVfvo2ZcR/ojRuV+5Bc4gmjSXj1qQnzUrHi/kMRj4hKSskOsr+SnrYRV9TTF ZhdeMkjv7yCb9mxZYvVahVvToJgcjPA9sVAJKST2NqAiD/rMNz0yzTV0/VZNS2tq oIR/RXnvhduFvBqAusN5EcgqPkdX7idTwfoDlQZpfX9ZixUbxqPDqgxLnv35yuIc qKew1pA0vfMbZSU3ft22S16LtFI8dzvKRy7BOucN+sF+va2SDePDfeh3HCB+59nx 1BbgqMBrLftyB54wARGD1Nw1RM96Vw== =d7D7 -----END PGP SIGNATURE----- --wztelnjtf2gvf2fg-- From owner-freebsd-git@freebsd.org Sat Feb 20 06:34:43 2021 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 3542053ADFD for ; Sat, 20 Feb 2021 06:34:43 +0000 (UTC) (envelope-from philip@freebsd.org) 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 4DjJZq0vtLz4mc2 for ; Sat, 20 Feb 2021 06:34:43 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 1D50353ADFB; Sat, 20 Feb 2021 06:34: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 1D20053ADFA for ; Sat, 20 Feb 2021 06:34:43 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DjJZq0KWWz4mxq; Sat, 20 Feb 2021 06:34:43 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from weatherwax.trouble.is (weatherwax.trouble.is [IPv6:2a00:1098:82:3a::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "weatherwax.trouble.is", Issuer "R3" (verified OK)) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id DB0AD28869; Sat, 20 Feb 2021 06:34:42 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from rincewind.trouble.is (rincewind.trouble.is [95.216.22.234]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits)) (Client CN "rincewind.trouble.is", Issuer "R3" (verified OK)) by weatherwax.trouble.is (Postfix) with ESMTPS id 4DjJZn6m96z1hH; Sat, 20 Feb 2021 06:34:41 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4DjJZm4gcFz2JQ4; Sat, 20 Feb 2021 06:34:40 +0000 (UTC) From: "Philip Paeps" To: "Daniel Ebdrup Jensen" Cc: git@FreeBSD.org Subject: Re: Regarding commit notifications Date: Sat, 20 Feb 2021 14:34:36 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5757) Message-ID: <2559B0A0-9BBF-4A52-8354-757E08381137@freebsd.org> In-Reply-To: <20210220043627.ouvbirq4n2elmjdk@nerd-thinkpad.local> References: <20210220043627.ouvbirq4n2elmjdk@nerd-thinkpad.local> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sat, 20 Feb 2021 06:34:43 -0000 On 2021-02-20 12:36:27 (+0800), Daniel Ebdrup Jensen wrote: > I had a thought the other day, that it would be nice if the subject > message sent to src-commiters and doc-commiters (and the > branch-specific > mailing lists) included the repo in question. > > For example, a mail sent to doc-commiters looked something like this > git: - doc/main - > > Ie. the only thing that's added is the "doc/" part. > > I already mentioned this in #gitcvt on EFnet, but jhb@ asked me to > send > it in as an email. > > jhb@ also pointed out that there are mail-headers, which I wasn't > aware > of, but I still think it would be great to have it in the subject. :) > > Naturally, this doesn't need to go to the top of the TODO list ;) This sounds very redundant. The doc commit mails already go to a separate mailing list from the src commit mailing list. And as jhb pointed out: there are X-headers in the message to tell you the repo (and more) too. The downside of this is that people reading commit mail in narrow windows will see even less of the actual subject of the commit than we see now. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From owner-freebsd-git@freebsd.org Sat Feb 20 06:39:30 2021 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 92FD553B27C for ; Sat, 20 Feb 2021 06:39:30 +0000 (UTC) (envelope-from debdrup@freebsd.org) 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 4DjJhL3TXfz4n2t for ; Sat, 20 Feb 2021 06:39:30 +0000 (UTC) (envelope-from debdrup@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7548953B416; Sat, 20 Feb 2021 06:39:30 +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 7512853B3A8 for ; Sat, 20 Feb 2021 06:39:30 +0000 (UTC) (envelope-from debdrup@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DjJhL2vPkz4n8x; Sat, 20 Feb 2021 06:39:30 +0000 (UTC) (envelope-from debdrup@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1613803170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YyJFzht3akKUnmbY9LLr5zI6BAt85+By3bRpcszIrPc=; b=b5+2/RXhw+i/CcOHtn8U3q8dFN2aNwTJaFst8E/TmG8cf9XoTJvYMcQ1odg+0guZ5ve9ri GLKnJ0Gg4snneYRZPrlHBtT6jUO1HWwtBbfJv4e+kf0K0dwBCTy7RY7QRSdQUTGaYrFXqU EDI99ZOJTUv3eu97a5AeCyvcSU4cTIHdjsm0BCQvaoXsY0BkubTG8RvmSXm0sJGXR1q0Fy ySbzBpvhFlUDAwU676RikhH98QBIzmdZH8pQxcZf3JR+9o2VtjVrvNhO4sScOfD1p8XkQ4 KEjdHXJigS6LCZPlCsr1Pdr0Vehzqw1vkAFmbcI5DI/Q4oBPb1wTju5zmmDgrA== Received: by freefall.freebsd.org (Postfix, from userid 1471) id 4920911137; Sat, 20 Feb 2021 06:39:30 +0000 (UTC) Date: Sat, 20 Feb 2021 07:39:27 +0100 From: Daniel Ebdrup Jensen To: Philip Paeps Cc: git@FreeBSD.org Subject: Re: Regarding commit notifications Message-ID: <20210220063927.yky5balwt4skqoj3@nerd-thinkpad.local> References: <20210220043627.ouvbirq4n2elmjdk@nerd-thinkpad.local> <2559B0A0-9BBF-4A52-8354-757E08381137@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="nbyl332kk657vpc5" Content-Disposition: inline In-Reply-To: <2559B0A0-9BBF-4A52-8354-757E08381137@freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1613803170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YyJFzht3akKUnmbY9LLr5zI6BAt85+By3bRpcszIrPc=; b=iD3VwaJOZEDu/uG6TTZpBBo2R3rFW0K9TS7MHWhWbHNMY6lUon9pMyabWZ6pdCRDND288S nqcFz3NYGrfvjLwXzeEWbzopYDCQjD9wjHhgxMpnqwF534tdkRq4K3vQycsQCe0drR76PK nEewX3CzsB3MMPs6hbRNdU6brjzgkXWHE34rPPM29IcXPRZgV89V5m6zNYpgsBXJbYiXxy ZaYVLw2tmGvyIRnPHTvHaWvS4X+5ZOXDkshrxNWBE3PyPfMCqwd3auReRjpqem2J2bUnLw RYIv0qxbKnTY5ydf9dkBIZzwemCpl69YMzdP+3+hDya7d9AHqbFuxud3876UWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1613803170; a=rsa-sha256; cv=none; b=N9QQwyAAPwsI3KXuZwkNInM6HWQi7IabsYcyuJmT2IWcwTeyJ4gZgwjlvWPjUb9BIpQ2LK rgaKFTyuPPEyX0/0t4NsGXMBbr99Cktv0rjaCifasmLZXunu6hlmsbiLAXCoasDCBbGioK Bxfbh78rzG9XLkTbYwUgooclGLTtTJO6E5qZJ842SsDCHpjavGWVZipqRofJ30jGPyq/BW B2G/h7wOKYW409Q5gRJYhEG2x0tYBvoTQQrLy3oXXIWikto9gaVEZIOGYPph2tN+FdKq13 K+kh4Jq5NByt+zEXCOHu/O1FgwAM9L1NqNV28WJuYdhoOgxkBj7mF5fJ6PtPAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sat, 20 Feb 2021 06:39:30 -0000 --nbyl332kk657vpc5 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Feb 20, 2021 at 02:34:36PM +0800, Philip Paeps wrote: >On 2021-02-20 12:36:27 (+0800), Daniel Ebdrup Jensen wrote: >>I had a thought the other day, that it would be nice if the subject >>message sent to src-commiters and doc-commiters (and the=20 >>branch-specific >>mailing lists) included the repo in question. >> >>For example, a mail sent to doc-commiters looked something like this >>git: - doc/main - >> >>Ie. the only thing that's added is the "doc/" part. >> >>I already mentioned this in #gitcvt on EFnet, but jhb@ asked me to=20 >>send >>it in as an email. >> >>jhb@ also pointed out that there are mail-headers, which I wasn't=20 >>aware >>of, but I still think it would be great to have it in the subject. :) >> >>Naturally, this doesn't need to go to the top of the TODO list ;) > >This sounds very redundant. The doc commit mails already go to a=20 >separate mailing list from the src commit mailing list. And as jhb=20 >pointed out: there are X-headers in the message to tell you the repo=20 >(and more) too. > >The downside of this is that people reading commit mail in narrow=20 >windows will see even less of the actual subject of the commit than we=20 >see now. > >Philip > >--=20 >Philip Paeps >Senior Reality Engineer >Alternative Enterprises Hi Philip, The problem is that for all of us who're forwarding, to a (in my case hosted) gmail account because we access mail from multiple systems and FreeBSD (reasonably enough) doesn't offer IMAP services, can't really filter on the mail headers such as X-Git-Repository - at least not that I've been able to find. I guess I'll go look for another solution then. Yours, Daniel Ebdrup Jensen --nbyl332kk657vpc5 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEDonNJPbg/JLIMoS6Ps5hSHzN87oFAmAwrp9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDBF ODlDRDI0RjZFMEZDOTJDODMyODRCQTNFQ0U2MTQ4N0NDREYzQkEACgkQPs5hSHzN 87qdtAf7B5KS1RqELd2MTze1cbfT8pS9KhK3SsOJQHu1iia8riLV2GIjEFXprCgF 7o2irokXG4CbXR5LzCSR1HOwB19ciGlCzCpnYJ0MEjbsC5p55A9jmIhC9wpVZpZs 0enCRklCPUbGkwBMsUT84K3QtQFhgJS2wO1SYgfLDijNv7Ux+0qFjtIxrEjUrZ08 rSDn569WGBJLUuDi33/uUvfNs7A8jpPe0Cp1nCr4F+DkO4oWqin/8SB8GaRIEXhb KnBCzr+69/asFfSqtxn6XBjUcxVOWqmwMkCfccLMguESg+K/e35gEOwsCFfh0PlL /5ZNTU2kJW9RfdZeDUqy7nsm8SJBsA== =A9KC -----END PGP SIGNATURE----- --nbyl332kk657vpc5-- From owner-freebsd-git@freebsd.org Sat Feb 20 06:52:19 2021 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 48D1353B8A6 for ; Sat, 20 Feb 2021 06:52:19 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4DjJz71WHkz4nFj for ; Sat, 20 Feb 2021 06:52:19 +0000 (UTC) (envelope-from philip@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 33EC053B8A5; Sat, 20 Feb 2021 06:52: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 33B4053B3F8 for ; Sat, 20 Feb 2021 06:52:19 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DjJz70xhmz4nCG; Sat, 20 Feb 2021 06:52:19 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from weatherwax.trouble.is (weatherwax.trouble.is [46.235.227.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "weatherwax.trouble.is", Issuer "R3" (verified OK)) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id F262B292B7; Sat, 20 Feb 2021 06:52:18 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from rincewind.trouble.is (rincewind.trouble.is [IPv6:2a01:4f9:2a:1715::1:1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits)) (Client CN "rincewind.trouble.is", Issuer "R3" (verified OK)) by weatherwax.trouble.is (Postfix) with ESMTPS id 4DjJz61kYFz1jD; Sat, 20 Feb 2021 06:52:18 +0000 (UTC) Received: by rincewind.trouble.is (Postfix, authenticated sender philip) id 4DjJz46902z2JN4; Sat, 20 Feb 2021 06:52:16 +0000 (UTC) From: "Philip Paeps" To: "Daniel Ebdrup Jensen" Cc: git@FreeBSD.org Subject: Re: Regarding commit notifications Date: Sat, 20 Feb 2021 14:52:12 +0800 X-Clacks-Overhead: GNU Terry Pratchett X-Mailer: MailMate (1.14r5757) Message-ID: <63074B53-2F6B-4C53-A75F-1AE3A5992C97@freebsd.org> In-Reply-To: <20210220063927.yky5balwt4skqoj3@nerd-thinkpad.local> References: <20210220043627.ouvbirq4n2elmjdk@nerd-thinkpad.local> <2559B0A0-9BBF-4A52-8354-757E08381137@freebsd.org> <20210220063927.yky5balwt4skqoj3@nerd-thinkpad.local> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sat, 20 Feb 2021 06:52:19 -0000 On 2021-02-20 14:39:27 (+0800), Daniel Ebdrup Jensen wrote: > On Sat, Feb 20, 2021 at 02:34:36PM +0800, Philip Paeps wrote: >> On 2021-02-20 12:36:27 (+0800), Daniel Ebdrup Jensen wrote: >>> I had a thought the other day, that it would be nice if the subject >>> message sent to src-commiters and doc-commiters (and the >>> branch-specific >>> mailing lists) included the repo in question. >>> >>> For example, a mail sent to doc-commiters looked something like this >>> git: - doc/main - >>> >>> Ie. the only thing that's added is the "doc/" part. >>> >>> I already mentioned this in #gitcvt on EFnet, but jhb@ asked me to >>> send >>> it in as an email. >>> >>> jhb@ also pointed out that there are mail-headers, which I wasn't >>> aware >>> of, but I still think it would be great to have it in the subject. >>> :) >>> >>> Naturally, this doesn't need to go to the top of the TODO list ;) >> >> This sounds very redundant. The doc commit mails already go to a >> separate mailing list from the src commit mailing list. And as jhb >> pointed out: there are X-headers in the message to tell you the repo >> (and more) too. >> >> The downside of this is that people reading commit mail in narrow >> windows will see even less of the actual subject of the commit than >> we see now. > > The problem is that for all of us who're forwarding, to a (in my case > hosted) gmail account because we access mail from multiple systems and > FreeBSD (reasonably enough) doesn't offer IMAP services, can't really > filter on the mail headers such as X-Git-Repository - at least not > that > I've been able to find. > > I guess I'll go look for another solution then. Can't you simply filter on the To: header? If the Subject: header is the only thing you can filter on, that's pretty terrible. Amusingly, we did have 'src' and 'doc' and 'ports' in the Subject: header when we were using CVS. That went away when we migrated to Subversion. What did you filter on between 2008 and 2020? Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises