From nobody Thu Nov 25 23:29:04 2021 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BE94118B1E2B for ; Thu, 25 Nov 2021 23:29:08 +0000 (UTC) (envelope-from pauamma@gundo.com) Received: from mail.gundo.com (gibson.gundo.com [75.145.166.65]) by mx1.freebsd.org (Postfix) with ESMTP id 4J0Yx00zpPz3qGg for ; Thu, 25 Nov 2021 23:29:08 +0000 (UTC) (envelope-from pauamma@gundo.com) Received: from webmail.gundo.com (variax.gundo.com [75.145.166.70]) by mail.gundo.com (Postfix) with ESMTP id 7E4964C5002; Thu, 25 Nov 2021 17:29:07 -0600 (CST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Thu, 25 Nov 2021 23:29:04 +0000 From: Pau Amma To: Warner Losh Cc: freebsd-git Subject: Re: Short Term Focus In-Reply-To: References: User-Agent: Roundcube Webmail/1.4.8 Message-ID: <33fa44fd63fc73cd1a4f3f371df60bc0@gundo.com> X-Sender: pauamma@gundo.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4J0Yx00zpPz3qGg X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of pauamma@gundo.com designates 75.145.166.65 as permitted sender) smtp.mailfrom=pauamma@gundo.com X-Spamd-Result: default: False [-3.40 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[pauamma]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[75.145.166.65:from]; R_SPF_ALLOW(-0.20)[+a:c]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[gundo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_MED(-0.20)[75.145.166.65:from]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:7922, ipnet:75.144.0.0/13, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On 2021-11-20 06:14, Warner Losh wrote: > We had an impromptu discussion about pre-commit testing after the > vendor > summit today. Thanks for that summary. Reading between the lines, it seems to be mostly or only about automated testing of base. Is that correct? From nobody Mon Dec 6 19:26:12 2021 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 31D4618C3B2B for ; Mon, 6 Dec 2021 19:26:20 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J7D1l40r6z4jXC for ; Mon, 6 Dec 2021 19:26:16 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 6EE1A8D4A129 for ; Mon, 6 Dec 2021 19:26:15 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id D39AAE707BD for ; Mon, 6 Dec 2021 19:26:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id eSXNMeX40y8Q for ; Mon, 6 Dec 2021 19:26:13 +0000 (UTC) Received: from nv.sbone.de (nv.sbone.de [IPv6:fde9:577b:c1a9:31::2013:138]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id B6941E707B6 for ; Mon, 6 Dec 2021 19:26:13 +0000 (UTC) Date: Mon, 6 Dec 2021 19:26:12 +0000 (UTC) From: "Bjoern A. Zeeb" To: freebsd-git@FreeBSD.org Subject: CSRG archive? Message-ID: X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Rspamd-Queue-Id: 4J7D1l40r6z4jXC X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of bzeeb-lists@lists.zabbadoz.net designates 195.201.62.131 as permitted sender) smtp.mailfrom=bzeeb-lists@lists.zabbadoz.net X-Spamd-Result: default: False [-1.73 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_FIVE(0.00)[5]; NEURAL_HAM_MEDIUM(-0.94)[-0.938]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:195.201.62.131:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-0.95)[-0.954]; RCVD_TLS_LAST(0.00)[]; NEURAL_HAM_SHORT(-0.54)[-0.538]; DMARC_NA(0.00)[zabbadoz.net]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:195.201.0.0/16, country:DE]; SUBJECT_ENDS_QUESTION(1.00)[] X-ThisMailContainsUnwantedMimeParts: N Hi, do we have a copy of the SVN CSRG tree in git somewhere? There is vendor/CSRG in src but that doesn't seem to match the SVN. Are there any plans to convert it if it wasn't done? /bz -- Bjoern A. Zeeb r15:7 From nobody Mon Dec 6 19:45:29 2021 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2F81018C7AB5 for ; Mon, 6 Dec 2021 19:45:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa34.google.com (mail-vk1-xa34.google.com [IPv6:2607:f8b0:4864:20::a34]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J7DS60fdDz4lxx for ; Mon, 6 Dec 2021 19:45:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa34.google.com with SMTP id f7so7636629vkf.10 for ; Mon, 06 Dec 2021 11:45:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FVJ7gGwxzE6IG48GR6ezNI9HVlFSt9xjVcZ606Rw1fg=; b=cLeUhVOizMPxeANrUpnjoRz0iQUbxeQqKlmMVKmjC+vKZstuod9AKPbo+b70PXjxb2 mjsmiQwraiD55PKrSUeCiV6X6/qltuA0j7gpQFFgxSGQR2pJ0Xafb6CNCvYDzWtRt/Jl xp4/E+Ks8LCXEPMt8xIzbluJ7o/WwZKMUNKhvw4rS/9GZItCdwn3NdhWcNzxj8j2e0m8 MoH2/CuzGD6oGhL7EgFlLiDVaf9DOft5BbooOU/J27nEujzaRp/k1k0vi+v5rncAj7zt hy1N0tCQg/BMo70WcFV/NJ5YtAqHY/zknLLybcVPnzOI8ig64Fk+PGVKmhQCsFMs31Dt leYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FVJ7gGwxzE6IG48GR6ezNI9HVlFSt9xjVcZ606Rw1fg=; b=YeKH/Eet06aDOWKrUvCuNpusnlf0UOp+C1QQJso65yqOsrbutBttmOH18iepVVshLv Dg8guMB6c/bWlSRJVhe1o+0yeA9aeRAB5tVqeF9Mo4izcpDNa9vpmFWmsgsQ8UT8gHQO IrFgTL1Z3DJHFso+QWd3x9tOF1gPSW7EPmZqTeokDuzMvCN5CPNV8AMm9QkzSaKMsUOb jCzndtDQw6IaHnJ1yb5g7omNxLVJumW6rr7Ms7QWPDFwyhWv3QCHEp2JSA11fZgdBHTL 8Z0Ml07P0z6xPUVnX8GxPy/81W5P6C/Wal3P4iRVOjSYfoFSzEtgO9CNzw4k31Om/LxY nnbg== X-Gm-Message-State: AOAM533+hTkVW77OnXP9/GgYDugITDojQZ5lDRnfUCQLqC0bYvaSjY7+ 6tJvh+hC4E+08NfnRFD0rY+f2Sua/Tw4T+CxE1owy/lrsTY= X-Google-Smtp-Source: ABdhPJzKdbfeNZD6SJEq49XrI9rFhHDBWnVPSKUHavxghlD1YeWvfceL5td9Ue34uwCqiCbuCk4BlW4wyXnW+rFlFOU= X-Received: by 2002:a1f:c9c2:: with SMTP id z185mr44390538vkf.26.1638819940850; Mon, 06 Dec 2021 11:45:40 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Mon, 6 Dec 2021 12:45:29 -0700 Message-ID: Subject: Re: CSRG archive? To: "Bjoern A. Zeeb" Cc: freebsd-git Content-Type: multipart/alternative; boundary="0000000000006cfcea05d27f8006" X-Rspamd-Queue-Id: 4J7DS60fdDz4lxx X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: Y --0000000000006cfcea05d27f8006 Content-Type: text/plain; charset="UTF-8" On Mon, Dec 6, 2021, 12:26 PM Bjoern A. Zeeb wrote: > Hi, > > do we have a copy of the SVN CSRG tree in git somewhere? There is > vendor/CSRG in src but that doesn't seem to match the SVN. > There have been several on the net. Are there any plans to convert it if it wasn't done? > We haven't done one. The quality of the SCCS to SVN is kinda low, though. SCCS didn't preserve renames very well, and some deleted files are gone forever. We looked at trying to come up a graft to hook it up as prehistory of the project. It didn't give good results when I tried it... Warner /bz > > -- > Bjoern A. Zeeb r15:7 > > --0000000000006cfcea05d27f8006-- From nobody Tue Dec 14 17:30:40 2021 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 91FDA18EFC39 for ; Tue, 14 Dec 2021 17:30:41 +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 4JD54d38b7z3v1t; Tue, 14 Dec 2021 17:30:41 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (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 097F23B44; Tue, 14 Dec 2021 17:30:40 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Tue, 14 Dec 2021 09:30:40 -0800 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: CSRG archive? Content-Language: en-US To: "Bjoern A. Zeeb" , freebsd-git@FreeBSD.org References: From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639503041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sPcbl+QoA4aR7r13F8Ka58LNq4nkO0nfKro7oLtmZVU=; b=qjpWIxVmkmHM+ixQrjQGM2v3Z+vdOfLuxzuGCk8xZiDH16+aGaSqDD8XtwLVLziBAodRTs 6Bt7uHH8xRuYWjKfqEO8LfRVFsN7MMftkDIpPo2+THzURu0VM+r9XzUHJ+VTc2474zZpFN rWOWhmnx88tlHFhDhp4jk/tBOXLjqiDKBQy9bhg7jpr5TpOFHpZ4/3DwMbDhEqMzKrCeOp dSXslG/LmaTUSbkDed34j6KZDFWVP1wQVKwrpHYxu03Ze3Gre7nXhpBG/LmBxqG2aRMQhw UsiUUoB8GJFuFsjWiZlijYat3OKgTo6yWT0K4Bg29XwzwBhtHvwyy0G57S9L3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639503041; a=rsa-sha256; cv=none; b=QVqpEyhDQ7lEsDOyBr8EP+MueWFHLFQXyLE4vFHo8e/MPcv69fxwY+n6O32UrnGG4Vs4qS 3Uu7dS81JTPo89tfwg5AeEh1zm7cgBJAs5Vs11AtQhQoPrmSqrK9U41tKa9Hc/FIGanAWc o3RTnwibPEVEq0TeSV8oyyx7IVYQbuveFBAlyuxtQWItLF0mL9UJXn870SqhEkU9E07DbX QGCXObV3gOaqg/gsIo9SeK8kaT+BskSBtlFiylveW0LFT2O+FmIq9HPZSmkKipbsBLt6BA 1WL37DRdDuv3fXuwO/l+KoyYPvc460dxJON/fVBNeELznYGugAy+92YVsgrz1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 12/6/21 11:26 AM, Bjoern A. Zeeb wrote: > Hi, > > do we have a copy of the SVN CSRG tree in git somewhere? There is > vendor/CSRG in src but that doesn't seem to match the SVN. I think a copy of the conversion I originally did that Kirk verified I could release is available on ftp.freebsd.org somewhere. The vendor/CSRG is an old CVS tag and not related. If you want a unified history I suggest looking at ddimoas (misspelled I'm sure) repository on GitHub that is a unified git tree that includes both CSRG, various UNIXen, BSD's, etc. -- John Baldwin From nobody Tue Dec 14 18:41:53 2021 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 61DB518DB546 for ; Tue, 14 Dec 2021 18:42:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ua1-x936.google.com (mail-ua1-x936.google.com [IPv6:2607:f8b0:4864:20::936]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JD6g029n2z4k4V for ; Tue, 14 Dec 2021 18:42:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ua1-x936.google.com with SMTP id y22so562318uap.2 for ; Tue, 14 Dec 2021 10:42:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xJqYY1HSlud6sdq54tRcKx7lTk2GAEwlTZU3Mstn9B8=; b=mAFBcAyQEjYvBw1W7o1T6yeNni0EvoPwkY1eJ4Aio7qftqBHMc6BqFpWqmWtpUxFTC W0XjYLu8QhSEpTuQSPQUMA8FlCl0dV3nrgL7FLLJLSNHnJV+1YyiW4b11rmgrJ3C7nmX uN+3hkcWpaOeJVGyr2ElvYvl5gZnXRCCw10XVP1rbr6GQNZLdTz/7gduzBd/B07xX2ox bupvTO5LzD4Xa8eNc75GCAbmxJhO9y8R4OvKV2GvJcinpaOKSOCk74kiC8wOGDPBQXwc +nIwbcRp4ulwRU79z+rIo45E6Ezuaq8HF5sWfJG1WDgcwOa27pYbnnOgsVQQN9zxXpMA jz3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xJqYY1HSlud6sdq54tRcKx7lTk2GAEwlTZU3Mstn9B8=; b=un3hxKU1cMBYui48NJ8GOQHMHaZz8G/hva8R3HS9a4BFsI+t1/ii2Xm2nYcqvaq8Lc +TOS9YbOLNhnJAkiTXGMi5jObfcQG+9E/WjXyfq83jjPGtG4HbPRn6MBOrVM6WeHxzIh d6x5VAdcep6R8s8il/QYWZVIpgXqp5CzxsWUqgXmT5qsoc4w4yAbt2sYkujhxdMv+DDW 6DxsHF0o2d0N8LyL4jo8OjaVU5DP06mytQ9A9OeanZNiWO80Qnjr+Ad3Fuz1ZyF19dNp WgvGFTPAzcN3CFazmCMiqhahM6bY4kPbh2aYYPJ4bVPb+ExVq/kNzCdw/33DmFHKfEQX pU6A== X-Gm-Message-State: AOAM530HEMEBgXhVGkTDBUYsUnLFFUgd/YBMnjTaRAdhM8vp8I9VYQ0o X25KiJmtBvPM32ndzUln8YWPp0KtRBk8g3QHEVI8O2KZ6zd/s37y X-Google-Smtp-Source: ABdhPJyLb0fIFfra3Ow+7i8bqxY/AyYBdFFemb/+KIBm1Vod6khnE08BnibTFAk4ZZcVBxptbcD/a2Yoeg/yHo7noFI= X-Received: by 2002:a05:6102:2748:: with SMTP id p8mr697111vsu.13.1639507323718; Tue, 14 Dec 2021 10:42:03 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Tue, 14 Dec 2021 11:41:53 -0700 Message-ID: Subject: Re: CSRG archive? To: John Baldwin Cc: "Bjoern A. Zeeb" , freebsd-git Content-Type: multipart/alternative; boundary="000000000000a3289705d31f8b55" X-Rspamd-Queue-Id: 4JD6g029n2z4k4V X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: Y --000000000000a3289705d31f8b55 Content-Type: text/plain; charset="UTF-8" On Tue, Dec 14, 2021 at 10:30 AM John Baldwin wrote: > On 12/6/21 11:26 AM, Bjoern A. Zeeb wrote: > > Hi, > > > > do we have a copy of the SVN CSRG tree in git somewhere? There is > > vendor/CSRG in src but that doesn't seem to match the SVN. > > I think a copy of the conversion I originally did that Kirk verified > I could release is available on ftp.freebsd.org somewhere. > > The vendor/CSRG is an old CVS tag and not related. > > If you want a unified history I suggest looking at ddimoas (misspelled > I'm sure) repository on GitHub that is a unified git tree that includes > both CSRG, various UNIXen, BSD's, etc. > https://github.com/dspinellis/unix-history-repo Warner --000000000000a3289705d31f8b55-- From nobody Thu Dec 23 07:24:11 2021 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3D78B18FF122 for ; Thu, 23 Dec 2021 07:24:14 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JKMBj2Wqgz4tjv for ; Thu, 23 Dec 2021 07:24:13 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wm1-x331.google.com with SMTP id n10-20020a7bc5ca000000b00345c520d38eso2350475wmk.1 for ; Wed, 22 Dec 2021 23:24:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=9cEZQssBXzlRCBjUmAwtAZEr0VS619xJ6YtjrqQf59g=; b=H49ThNbUm5Fnkx3bKJHS9u/tDXtjbPIZAlhUglzAWLPNaH+cPCSNTdBkhgn2qJn6fw MdzKCQRdElkTewr4D3FE8HwVBlM6iMsPq/lbdkYrjOebt6hGjsrcQcruFNBiXtQWwkG4 aWCbONT2+2l0hnz50VkyNR0GBFjuvuES+Rw15shoSWVjGVh933ERqCZJ8rjuFGpHYxFU 1a5KeQEkHo4HUQwctsaFGbrA31f/uZUljH/s00iQKF+ulgltKUbPAZtqgCNAE4FlYPB6 dSV3Qu6Rrd62FgWiYvUyuh1TwDJ88qaJZjahKzNstg+vNosUqy9ZBvRJAQERdT49ccnr 0kUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=9cEZQssBXzlRCBjUmAwtAZEr0VS619xJ6YtjrqQf59g=; b=3EsLbEBi4Z+ZRDzS9yaUsD+M/DL7weRj5hxZhshzEwvFFLEerqTVAzxfNVs+7uMGL6 +ytCZn/dxV8/IWpG4DtTTga9Hbl8g6Cdm9KitEM8uyOx7kEtTrkHl7InItr5TB1SuBjU uNY4QpRWTRzbNAarMaufkduU6EyPVy5CE4azlkRE4GgiTuR8R44NFc0OpkW4eYHQEL4c rOtCTdb5cXD2LrE4f9MWdbFwUV+Vgeu/r0KE5ZJYSXiIff6Y0lw3ySFHMdWj8OHPgzkq 0W1smJhnWa5XSfGaSM0YzfmTRb9D87tn2KqMY+s7qY3HLRAPKaPVUOZedKwA5Xo8i9/Q CqPA== X-Gm-Message-State: AOAM533IvS2ksNFZCCHQ48Uqrf1xacbkUVAYlv/5KIvDFr3t2mzBWN7t TQW2Z9+Wpyjyq20H409NpEopEO3V2gQyRw== X-Google-Smtp-Source: ABdhPJzRnmS+FOPyT7Qq+DzhSGVGs+Wrzy6SJO04ihmEPcDEnDDt/AwNoZzR86z5ORp287I1CnMAZw== X-Received: by 2002:a05:600c:19cb:: with SMTP id u11mr805670wmq.142.1640244252062; Wed, 22 Dec 2021 23:24:12 -0800 (PST) Received: from ?IPV6:2001:470:1f1c:a0::2? (tunnel642390-pt.tunnel.tserv1.lon2.ipv6.he.net. [2001:470:1f1c:a0::2]) by smtp.gmail.com with ESMTPSA id h27sm7565012wmc.43.2021.12.22.23.24.11 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Dec 2021 23:24:11 -0800 (PST) Message-ID: <2c4fcb94-ff76-fa90-35d1-01dfcf07f0d6@gmail.com> Date: Thu, 23 Dec 2021 07:24:11 +0000 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: cgit, ages and chronological order Content-Language: en-GB To: freebsd-git References: <9766b3e1-fb5d-1993-46e2-057e2567315a@gmail.com> From: Graham Perrin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4JKMBj2Wqgz4tjv X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=H49ThNbU; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::331 as permitted sender) smtp.mailfrom=grahamperrin@gmail.com X-Spamd-Result: default: False [1.99 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_HAS_DN(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; NEURAL_SPAM_SHORT(1.00)[1.000]; NEURAL_SPAM_MEDIUM(0.99)[0.990]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::331:from]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; NEURAL_SPAM_LONG(1.00)[1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-ThisMailContainsUnwantedMimeParts: N On 10/11/2021 06:07, Warner Losh wrote: > Yes. Time is an illusion.  Git time doublely so. After successfully creating a filter in Thunderbird, I completely forgot that I had asked the question about order. Thank you, Warner and others, for all the replies. Graham     Aldrington Fields, Sussex         September 1899 From nobody Thu Jan 6 18:50:48 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B9612194095A for ; Thu, 6 Jan 2022 18:50:58 +0000 (UTC) (envelope-from david@crossfamilyweb.com) Received: from mail.dcrosstech.com (rrcs-24-97-5-250.nys.biz.rr.com [24.97.5.250]) (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 "mail.dcrosstech.com", Issuer "DCrossTech.com LLC CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVFmd6NLWz4hb4 for ; Thu, 6 Jan 2022 18:50:57 +0000 (UTC) (envelope-from david@crossfamilyweb.com) X-Virus-Scanned: amavisd-new at dcrosstech.com Received: from winry.priv.dcrosstech.com (d130.office.dcrosstech.com [10.1.12.130]) (authenticated bits=0) by mail.dcrosstech.com (8.15.2/8.15.2) with ESMTPSA id 206IomNP050960 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO) for ; Thu, 6 Jan 2022 18:50:48 GMT (envelope-from david@crossfamilyweb.com) X-Authentication-Warning: mail.priv.dcrosstech.com: Host d130.office.dcrosstech.com [10.1.12.130] claimed to be winry.priv.dcrosstech.com Subject: Slow clone of ports from own git server References: To: freebsd-git@freebsd.org From: "David E. Cross" X-Forwarded-Message-Id: Message-ID: Date: Thu, 6 Jan 2022 13:50:48 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Queue-Id: 4JVFmd6NLWz4hb4 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@crossfamilyweb.com designates 24.97.5.250 as permitted sender) smtp.mailfrom=david@crossfamilyweb.com X-Spamd-Result: default: False [-1.30 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+mx:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_NONE(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; MID_RHS_MATCH_FROM(0.00)[]; DMARC_NA(0.00)[crossfamilyweb.com]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:11351, ipnet:24.97.0.0/16, country:US]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Apologies, not sure if this is the right place, but seems to have all of the right checkboxes: FreeBSD, GIT, FreeBSD repository... :) I have my own git server (git-http-backend) via apache trying to manage my own clone of ports (I have a significant number of local modifications to ports that I am constantly trying to upstream). A problem that I have is that if I clone from my own server it sits and hangs for ~30+ seconds while the git process on the server spins at 100% CPU.  (This is a relatively recent Intel Xeon, 2.1ghz, 8 core, 64GB of memory machine).  CPU at 100% pegged suggests it isn't IO bound (they are spinny disks). Given the following output: > Cloning into 'freebsd-ports'... Hang happens here. > remote: Enumerating objects: 5142670, done. When cloning from the freebsd git sever for ports that hang is maybe 4 seconds.  What do I need to do to get equivalent performance?  what am I missing? Thanks! From nobody Thu Jan 6 23:13:10 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0A5D519418A8 for ; Thu, 6 Jan 2022 23:13:24 +0000 (UTC) (envelope-from david@crossfamilyweb.com) Received: from mail.dcrosstech.com (rrcs-24-97-5-250.nys.biz.rr.com [24.97.5.250]) (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 "mail.dcrosstech.com", Issuer "DCrossTech.com LLC CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVMbQ3qZ8z4Sj7 for ; Thu, 6 Jan 2022 23:13:22 +0000 (UTC) (envelope-from david@crossfamilyweb.com) X-Virus-Scanned: amavisd-new at dcrosstech.com Received: from winry.priv.dcrosstech.com (d130.office.dcrosstech.com [10.1.12.130]) (authenticated bits=0) by mail.dcrosstech.com (8.15.2/8.15.2) with ESMTPSA id 206NDAoh086867 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO) for ; Thu, 6 Jan 2022 23:13:10 GMT (envelope-from david@crossfamilyweb.com) X-Authentication-Warning: mail.priv.dcrosstech.com: Host d130.office.dcrosstech.com [10.1.12.130] claimed to be winry.priv.dcrosstech.com Subject: Re: Slow clone of ports from own git server From: "David E. Cross" To: freebsd-git@freebsd.org References: Message-ID: <05433e88-db2f-494e-fb33-79e3c9534ce6@crossfamilyweb.com> Date: Thu, 6 Jan 2022 18:13:10 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Queue-Id: 4JVMbQ3qZ8z4Sj7 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@crossfamilyweb.com designates 24.97.5.250 as permitted sender) smtp.mailfrom=david@crossfamilyweb.com X-Spamd-Result: default: False [-3.18 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; HAS_XAW(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_NONE(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_NA(0.00)[crossfamilyweb.com]; NEURAL_HAM_MEDIUM(-0.88)[-0.883]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:11351, ipnet:24.97.0.0/16, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N And nevermind, a "git maintenance run" fixed it (which I found after some desperation).. which I didn't even consider since this was a FRESH clone and a new repository that got pushed to. It is practically instant now (sub second) TIL On 1/6/22 1:50 PM, David E. Cross wrote: > Apologies, not sure if this is the right place, but seems to have all > of the right checkboxes: FreeBSD, GIT, FreeBSD repository... :) > > > I have my own git server (git-http-backend) via apache trying to > manage my own clone of ports (I have a significant number of local > modifications to ports that I am constantly trying to upstream). > > > A problem that I have is that if I clone from my own server it sits > and hangs for ~30+ seconds while the git process on the server spins > at 100% CPU.  (This is a relatively recent Intel Xeon, 2.1ghz, 8 core, > 64GB of memory machine).  CPU at 100% pegged suggests it isn't IO > bound (they are spinny disks). > > Given the following output: > >> Cloning into 'freebsd-ports'... > > Hang happens here. > >> remote: Enumerating objects: 5142670, done. > > > When cloning from the freebsd git sever for ports that hang is maybe 4 > seconds.  What do I need to do to get equivalent performance?  what am > I missing? > > > Thanks! > > From nobody Mon May 2 17:27:39 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 22C941AA9E35 for ; Mon, 2 May 2022 17:27:47 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (udns.ultimatedns.net [24.113.41.81]) (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 "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsVR653xDz3MQ8 for ; Mon, 2 May 2022 17:27:46 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 242HReuO050370 for ; Mon, 2 May 2022 10:27:46 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Mon, 02 May 2022 10:27:39 -0700 From: Chris To: freebsd-git Subject: When are the git servers available to obtain the ports tree? User-Agent: UDNSMS/17.0 Message-ID: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: multipart/mixed; boundary="=_433e5896ca3767c6f1ca95e7f578a8bb" X-Rspamd-Queue-Id: 4KsVR653xDz3MQ8 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] X-ThisMailContainsUnwantedMimeParts: N --=_433e5896ca3767c6f1ca95e7f578a8bb Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed I'm a maintainer for well over 100 ports. But more often than not, I am not permitted to obtain the ports tree from any of the FreeBSD git servers: # git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/ports.git PORTS-20220502 returns: error: RPC failed; HTTP 504 curl 22 The requested URL returned error: 504 fatal: error reading section header 'shallow-info' What is the charge for obtaining a current ports tree? Can I purchase an annual subscription? What else do I need to obtain the tree? Thanks. l8r, Chris --=_433e5896ca3767c6f1ca95e7f578a8bb Content-Transfer-Encoding: 7bit Content-Type: application/pgp-keys; name=0xBDE49540.asc Content-Disposition: attachment; filename=0xBDE49540.asc; size=5028 -----BEGIN PGP PUBLIC KEY BLOCK----- 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 1hJ30C8= =aMQi -----END PGP PUBLIC KEY BLOCK----- --=_433e5896ca3767c6f1ca95e7f578a8bb-- From nobody Mon May 2 17:50:57 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 16A301AAFBF5 for ; Mon, 2 May 2022 17:51:09 +0000 (UTC) (envelope-from kevans@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 4KsVy475Qhz3R4x for ; Mon, 2 May 2022 17:51:08 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651513869; 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=HXcaofUWFoOKTNd3joS6IYF2UfM0f/83nX34CpwBZtY=; b=RTalugvYQd3V6e6Iflo7TgRbSpqJ4TS7xkzmedraO4dgBV8jPcLXadZRuyYlRckJbu0FYm KgL3hgq9ah+gz1sGU4HXq7HT9FtSfhEX6u00MI9fOObvLGZ4HR1xsNyOza6KhTIBQwgSDx fAa/01hc9U9vBJVNZkN8tfsmQIp6juoWcs+AX1T3ZmJDOipnqTdDMsGDWn/hCKbeh95eJq STKx80lg4TKQUwdcON/lXbLEedUBPPZoxwv3rFvKRIHvHxVpLtv4Gopeou054IWPvfj4+2 5KPAr6RVzSEDZzG6Px4p+t5mHWfX7/BTWwoZXzRflt3WSljgs/TnLh5VEueoaw== Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id C1A71C0E0 for ; Mon, 2 May 2022 17:51:08 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lj1-f173.google.com with SMTP id m23so19341177ljc.0 for ; Mon, 02 May 2022 10:51:08 -0700 (PDT) X-Gm-Message-State: AOAM533kAKhXb9+UrT/9LvtB2R7horEQycfs+2Y7QhhvdwcpTNhGjhEY Y1f4cHKdqWZ0bLEAChCF3zwqHs/a7iS6S2yhQQY= X-Google-Smtp-Source: ABdhPJzw+Y+6CfOhzE+9BytZeI83hs7rHb+s3Lbey5Nf99hBeNlEesReC0j6twgRv6LpEiz4sfWt00yo7N73lWoO+PM= X-Received: by 2002:a2e:7c16:0:b0:246:377b:f802 with SMTP id x22-20020a2e7c16000000b00246377bf802mr8035697ljc.155.1651513867103; Mon, 02 May 2022 10:51:07 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> In-Reply-To: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> From: Kyle Evans Date: Mon, 2 May 2022 10:50:57 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: When are the git servers available to obtain the ports tree? To: Chris Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651513869; 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=HXcaofUWFoOKTNd3joS6IYF2UfM0f/83nX34CpwBZtY=; b=c7tmvIvS8EWCcUCGs78p630o56iS2D9ZcegNTV3Rk05fRKk2qtbO5z7ZsS8+01nVUU2bSr NWlxFzH2Q+kQQPSr4rOkANxsqVWx8pPMHgzOMq2W8Mh4NRabq8I3skJo95Ww3aEKOxlR3i 9wJmO/gaNQu/kam94GGi+wr3dm4QYjYZSTiPrsiJ3TWAVKrJzQNBPpORfrE3QDZYjoGISq MTWte1uUV1rEhYdGUeSbhp+6oXx6pXeCYQfFxViFMlwBb5lmD1mz+vx3VHWKTjS8MbZMpR TsY014twARFr1KlF/BVBb9AIFOvgug/qKySJYfqfG3N+FY8RWHLs66xuHImAdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651513869; a=rsa-sha256; cv=none; b=FEM8dc2ZR5U9fhG9lIkm/AbbsRAbqb8aH4NF52I4zpAslNZBuTQnhBsSvR6zZR+0EBeF2a fENMzCsloE3hUrspgQ3djW+2f3ZoKQnnzGcG0xVEf3sz3DvV8hJnd37ajr8u/qCTfki2gY QDI2spamj0grAerUOC6GXqVo+tffyJXi55O8i44rMeEctUUd+i6ckgIvbVGh77obJ/ehfv qOHKxenJvxVAKyI11IYkjJesplOKz5UEjPze8qGyLgl2Agn1c2xKMNCNdOorpRpZtm5zQd endZXKBYXzmcrulw5w6FKEFil0fxk4g5n8eEWQ+An1cgJJs08g4fRlKBeObkng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Mon, May 2, 2022 at 10:27 AM Chris wrote: > > I'm a maintainer for well over 100 ports. But more often than > not, I am not permitted to obtain the ports tree from any of > the FreeBSD git servers: > > # git clone -o freebsd --config > remote.freebsd.fetch='+refs/notes/*:refs/notes/*' > https://git.freebsd.org/ports.git PORTS-20220502 > > returns: > error: RPC failed; HTTP 504 curl 22 The requested URL returned error: 504 > fatal: error reading section header 'shallow-info' > > What is the charge for obtaining a current ports tree? Can I purchase an > annual subscription? > I understand this is probably an attempt at humor, but it comes off (to me) a little more aggressive/instigative than you might have intended. > What else do I need to obtain the tree? > I find trying to work with ports over HTTP to be a miserable experience, but anongit (see bottom of https://cgit.freebsd.org/ports) typically provides a pretty good experience. Thanks, Kyle Evans From nobody Mon May 2 17:59:14 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 953211AB14EE; Mon, 2 May 2022 17:59:23 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsW7Z66zSz3hrF; Mon, 2 May 2022 17:59:22 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.95 (FreeBSD)) (envelope-from ) id 1nlaKI-000IVY-8t; Mon, 02 May 2022 19:59:14 +0200 Date: Mon, 2 May 2022 19:59:14 +0200 From: Kurt Jaeger To: Chris Cc: freebsd-ports , freebsd-git Subject: Re: On what days are the git servers available to obtain the ports tree? Message-ID: References: List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4KsW7Z66zSz3hrF X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 2001:14f8:200:4::4 is neither permitted nor denied by domain of pi@freebsd.org) smtp.mailfrom=pi@freebsd.org X-Spamd-Result: default: False [-0.95 / 15.00]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[pi]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; R_SPF_SOFTFAIL(0.00)[~all]; NEURAL_SPAM_SHORT(0.15)[0.150]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; MLMMJ_DEST(0.00)[freebsd-ports,freebsd-git]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12502, ipnet:2001:14f8::/32, country:DE]; SUBJECT_ENDS_QUESTION(1.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N Hi! > I'm a maintainer for well over 100 ports. But more often than > not, I am not permitted to obtain the ports tree from any of > the FreeBSD git servers: > > # git clone -o freebsd --config > remote.freebsd.fetch='+refs/notes/*:refs/notes/*' > https://git.freebsd.org/ports.git PORTS-20220502 > > returns: > error: RPC failed; HTTP 504 curl 22 The requested URL returned error: 504 > fatal: error reading section header 'shallow-info' That's the command I use as well. To be honest, I do not need to clone the tree that often, once every few month is enough. -- pi@FreeBSD.org +49 171 3101372 Now what ? From nobody Mon May 2 18:06:01 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 088581AB3432 for ; Mon, 2 May 2022 18:06:09 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (udns.ultimatedns.net [24.113.41.81]) (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 "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsWHN5Ptbz3kcy; Mon, 2 May 2022 18:06:08 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 242I61YJ073583; Mon, 2 May 2022 11:06:07 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Mon, 02 May 2022 11:06:01 -0700 From: Chris To: Kyle Evans Cc: freebsd-git Subject: Re: When are the git servers available to obtain the ports tree? In-Reply-To: References: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> User-Agent: UDNSMS/17.0 Message-ID: <1f63c18ac160eac2268d332ab536abb7@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: multipart/mixed; boundary="=_461dd8c0be0457883e41c3609ceeea88" X-Rspamd-Queue-Id: 4KsWHN5Ptbz3kcy X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] X-ThisMailContainsUnwantedMimeParts: N --=_461dd8c0be0457883e41c3609ceeea88 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2022-05-02 10:50, Kyle Evans wrote: > On Mon, May 2, 2022 at 10:27 AM Chris wrote: >> >> I'm a maintainer for well over 100 ports. But more often than >> not, I am not permitted to obtain the ports tree from any of >> the FreeBSD git servers: >> >> # git clone -o freebsd --config >> remote.freebsd.fetch='+refs/notes/*:refs/notes/*' >> https://git.freebsd.org/ports.git PORTS-20220502 >> >> returns: >> error: RPC failed; HTTP 504 curl 22 The requested URL returned error: 504 >> fatal: error reading section header 'shallow-info' >> >> What is the charge for obtaining a current ports tree? Can I purchase an >> annual subscription? >> > > I understand this is probably an attempt at humor, but it comes off > (to me) a little more aggressive/instigative than you might have > intended. It's a combination of sarcasm && frustration; no harm intended, and I *think* everyone gets that. :-) But so noted. :-) This *should* be the reason I ask *before* getting so frustrated. > >> What else do I need to obtain the tree? >> > > I find trying to work with ports over HTTP to be a miserable > experience, but anongit (see bottom of https://cgit.freebsd.org/ports) > typically provides a pretty good experience. Thanks for the insight, Kyle, and taking the time to reply. --Chris > > Thanks, > > Kyle Evans --=_461dd8c0be0457883e41c3609ceeea88 Content-Transfer-Encoding: 7bit Content-Type: application/pgp-keys; name=0xBDE49540.asc Content-Disposition: attachment; filename=0xBDE49540.asc; size=5028 -----BEGIN PGP PUBLIC KEY BLOCK----- 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 1hJ30C8= =aMQi -----END PGP PUBLIC KEY BLOCK----- --=_461dd8c0be0457883e41c3609ceeea88-- From nobody Mon May 2 19:57:46 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7FB831AB06BD for ; Mon, 2 May 2022 19:57:53 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (udns.ultimatedns.net [24.113.41.81]) (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 "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsYmK2DrYz4f40 for ; Mon, 2 May 2022 19:57:53 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 242JvlcU087301; Mon, 2 May 2022 12:57:53 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Mon, 02 May 2022 12:57:46 -0700 From: Chris To: "Janky Jay, III" Cc: freebsd-git Subject: Re: On what days are the git servers available to obtain the ports tree? In-Reply-To: <13df051029243432f82b50a815926517@bsdforge.com> References: <71bb8213381565858ab36e680b9634de@bsdforge.com> <13df051029243432f82b50a815926517@bsdforge.com> User-Agent: UDNSMS/17.0 Message-ID: <1a5a02e597a320db175a14062cd9c229@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: multipart/mixed; boundary="=_fdba64b1034601d8ed09b72d4be5943b" X-Rspamd-Queue-Id: 4KsYmK2DrYz4f40 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] X-ThisMailContainsUnwantedMimeParts: N --=_fdba64b1034601d8ed09b72d4be5943b Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2022-05-02 12:55, Chris wrote: > On 2022-05-02 12:04, Chris wrote: >> On 2022-05-02 11:21, Janky Jay, III wrote: >>> Hi Chris, >>> >>> On 5/2/22 11:09, Chris wrote: >>>> I'm a maintainer for well over 100 ports. But more often than >>>> not, I am not permitted to obtain the ports tree from any of >>>> the FreeBSD git servers: >>>> >>>> # git clone -o freebsd --config >>>> remote.freebsd.fetch='+refs/notes/*:refs/notes/*' >>>> https://git.freebsd.org/ports.git PORTS-20220502 >>>> >>>> returns: >>>> error: RPC failed; HTTP 504 curl 22 The requested URL returned error: 504 >>>> fatal: error reading section header 'shallow-info' >>> >>> I've run into this issue in the past with older versions of git. I found >>> that >>> updating my version of git to anything equal or newer than 2.35.1 resolved >>> it. >>> >>> If you can't update your git version because you can't update your ports >>> tree, I >>> found that adjusting the size of the global config for git's >>> "http.postBuffer" to >>> 500MB fixed the issue for older git versions: >>> >>> # git config --global http.postBuffer 524288000 >>> >>> Hope that helps! >> I think you may have provided me with both the problem && solution. I'm >> performing >> all of this within a jail(8) && my copy of git is not the newest; the >> resources are >> also less than those of the host. So I would venture a guess that at >> *least* one of >> your proposed solution gets it for me. OK I tried #git config --global http.postBuffer 524288000 but the results were the same. :-( So I upgraded git to git-2.36.0 in that jail and again, the results were the same. :-( Thanks for your suggestions, Jay. Looks like I'll have to cobble up a script and add it to cron. To attempt to get a copy of the ports tree once a day. Not stopping attempts until successful. Thanks for trying! :-) > >> >> Thanks! :-) >> >> --Chris >>> >>> Regards, >>> Janky Jay, III --=_fdba64b1034601d8ed09b72d4be5943b Content-Transfer-Encoding: 7bit Content-Type: application/pgp-keys; name=0xBDE49540.asc Content-Disposition: attachment; filename=0xBDE49540.asc; size=5028 -----BEGIN PGP PUBLIC KEY BLOCK----- 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 1hJ30C8= =aMQi -----END PGP PUBLIC KEY BLOCK----- --=_fdba64b1034601d8ed09b72d4be5943b-- From nobody Tue May 3 01:42:58 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EF3AC1AB113D for ; Tue, 3 May 2022 01:43:03 +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 4KsjQb5wLlz4VQj; Tue, 3 May 2022 01:43:03 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651542183; 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=jnRpWqlAoeM79T+NjQwzCMGRa/hvYEmnnclcsvQWydI=; b=eYfTkEnAY692B+Vgn5ToWzuZ3jg8GyJK39ZdETSIzH/0FXy0yjvH1kKww2MImjHdT8uATO 4wdDPO/j2rbyKgXPfoYsUFq1J8mtrsRh+1dCEMaiu1UUx5/zTi3ZFjnrmJSd03Ka/fRpC4 z7eiLb9gr7thr4U7KzF7XQyN8egaIFL+gFbYDTrVDRggZajiaPKK8iiOCfuARkz5Y+7lWm NkUKhAlP3Y343H3AL+k6P2EdB92+0v/EN3CTWVm5fV7Uje500A6cIms2134VEXsGE/003H nJZJc5aNrK/OshB7J7mxrOlke4MOG1wf0o8o96EnB1B240c4B6jWS+QWkMUdnw== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id AA15D203F6; Tue, 3 May 2022 01:43:03 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailauth.nyi.internal (Postfix) with ESMTP id 1219027C0054; Mon, 2 May 2022 21:43:03 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 02 May 2022 21:43:03 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdeigdeglecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffokfgjfhggtgesthdtmh dtredttdenucfhrhhomheprfhhihhlihhpucfrrggvphhsuceophhhihhlihhpsehfrhgv vggsshgurdhorhhgqeenucggtffrrghtthgvrhhnpedvheehkefghfeiteehteduudeuhf dvgeettdeihfffleeuteeggeetuddttddufeenucffohhmrghinhepfhhrvggvsghsugdr ohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hphhhilhhiphdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihhthidqudduieeivdei vdegkedqvdefhedukedttdekqdhphhhilhhipheppehfrhgvvggsshgurdhorhhgsehtrh houhgslhgvrdhish X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 2 May 2022 21:43:01 -0400 (EDT) From: Philip Paeps To: Chris Cc: freebsd-git Subject: Re: When are the git servers available to obtain the ports tree? Date: Tue, 03 May 2022 09:42:58 +0800 X-Mailer: MailMate (1.14r5893) Message-ID: <81AFA1F5-E3EE-4E33-A2D7-58DB775674C3@freebsd.org> In-Reply-To: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> References: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651542183; 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=jnRpWqlAoeM79T+NjQwzCMGRa/hvYEmnnclcsvQWydI=; b=UVmvH0jWVk8itnJMm0PYD2wXT16fbHpo/uXwo7GMt7gUntVklouCVJ1K5ilb+8IRA4eM42 EyrgnZWYUGkY6SmVU+MvfpK6NL/nbl2UG3KyPiG3sFn265/6WA5c+PrcVQxKy0bJdvMFHW dyDkcfGDpryYzI4+z5HbRUYXpjpL/zCTAT6mQTIZ17nG7ekJObpQ/p8nFb6T7ZJUkYcVGx xC0Idn8zRHnCx1N6UIfdgB16raErgXlvveidGksd1RT+DiY1COZHSZdA4wgeuVLWRJ4J79 mm9PZMcy28LTThRkh+NIgWLW1+l4YszJciVK29f7seZzwZ/u6tcj8h7kRk1VkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651542183; a=rsa-sha256; cv=none; b=OWIUIya26hXSwcV+ZsoNpcflkSGLoC+YShzIovOA2M1JsgczhaD3sV8DYo5L2SCcREYl/E PpWFctpiVTSnic17tfEf3LKluctYnMjqBlk4ySrq4uzIeH9GaediXvLmNAtxJ9DTBx5U0z Sdh33zUyabk6oKSGLkjqCW0YUJFM7CVOf6xkfN6gkVVL61CB3uODCdYtGg0AePjJDW/9tb MC80A+fJNOqpAlfGQuORgPBDMNZ0/Kwt9pTOF0eZOnM+WOzr4E6Heku8zsYSJbzQEv0ETM KnUlr1qCaxROauqfEJUM9aoG0vePFXyTuIoGqm/jbKmReObRZbQQP+EZafT+iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 2022-05-03 01:27:39 (+0800), Chris wrote: > I'm a maintainer for well over 100 ports. But more often than > not, I am not permitted to obtain the ports tree from any of > the FreeBSD git servers: > > # git clone -o freebsd --config > remote.freebsd.fetch='+refs/notes/*:refs/notes/*' > https://git.freebsd.org/ports.git PORTS-20220502 Which mirror are you hitting? What does "host git.freebsd.org" say? > returns: > error: RPC failed; HTTP 504 curl 22 The requested URL returned error: > 504 > fatal: error reading section header 'shallow-info' I can't see how a mirror would give that error. My gut feeling is that this is a middlebox rather than one of our Git mirrors. I'd need to take a closer look at the logs to be sure. Please let me know what mirror you're hitting so I can check. Does using anongit@git.freebsd.org:ports.git instead of https://git.freebsd.org/ports.git work? That bypasses any HTTP weirdness. > What is the charge for obtaining a current ports tree? Can I purchase > an > annual subscription? It's included in the cost of your FreeBSD support contract. > What else do I need to obtain the tree? If you're maintaining 100+ ports, a small additional investment of time to familiarise yourself with Git will save you from having to download the entire ports tree every time. This is also better use of cluster resources maintained by other volunteers. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From nobody Tue May 3 03:44:14 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 152251AC84CA for ; Tue, 3 May 2022 03:44:22 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (udns.ultimatedns.net [24.113.41.81]) (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 "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ksm6Y59pPz4lfG; Tue, 3 May 2022 03:44:21 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 2433iEJK006432; Mon, 2 May 2022 20:44:20 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Mon, 02 May 2022 20:44:14 -0700 From: Chris To: Philip Paeps Cc: freebsd-git Subject: Re: When are the git servers available to obtain the ports tree? In-Reply-To: <81AFA1F5-E3EE-4E33-A2D7-58DB775674C3@freebsd.org> References: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> <81AFA1F5-E3EE-4E33-A2D7-58DB775674C3@freebsd.org> User-Agent: UDNSMS/17.0 Message-ID: <26dc45b81218bd3b670145340035ad66@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: multipart/mixed; boundary="=_62d73a23d2cf4e003d136bc931a59f11" X-Rspamd-Queue-Id: 4Ksm6Y59pPz4lfG X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] X-ThisMailContainsUnwantedMimeParts: N --=_62d73a23d2cf4e003d136bc931a59f11 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2022-05-02 18:42, Philip Paeps wrote: > On 2022-05-03 01:27:39 (+0800), Chris wrote: >> I'm a maintainer for well over 100 ports. But more often than >> not, I am not permitted to obtain the ports tree from any of >> the FreeBSD git servers: >> >> # git clone -o freebsd --config >> remote.freebsd.fetch='+refs/notes/*:refs/notes/*' >> https://git.freebsd.org/ports.git PORTS-20220502 > Thanks for the reply, Philip. > Which mirror are you hitting? What does "host git.freebsd.org" say? # host git.freebsd.org git.freebsd.org is an alias for gitmir.geo.freebsd.org. gitmir.geo.freebsd.org has address 149.20.1.203 gitmir.geo.freebsd.org has IPv6 address 2001:4f8:1:11::e6a:1 gitmir.geo.freebsd.org mail is handled by 0 > >> returns: >> error: RPC failed; HTTP 504 curl 22 The requested URL returned error: 504 >> fatal: error reading section header 'shallow-info' > > I can't see how a mirror would give that error. My gut feeling is that this > is a > middlebox rather than one of our Git mirrors. I'd need to take a closer > look at > the logs to be sure. Please let me know what mirror you're hitting so I can > check. > > Does using anongit@git.freebsd.org:ports.git instead of > https://git.freebsd.org/ports.git work? That bypasses any HTTP weirdness. I'll check. Thanks for the insight. > >> What is the charge for obtaining a current ports tree? Can I purchase an >> annual subscription? > > It's included in the cost of your FreeBSD support contract. Sweet! :-) > >> What else do I need to obtain the tree? > > If you're maintaining 100+ ports, a small additional investment of time to > familiarise yourself with Git will save you from having to download the > entire > ports tree every time. This is also better use of cluster resources > maintained by > other volunteers. That's fair to say. But still... ;-) Thanks again! :-) > > Philip l8r, Chris --=_62d73a23d2cf4e003d136bc931a59f11 Content-Transfer-Encoding: 7bit Content-Type: application/pgp-keys; name=0xBDE49540.asc Content-Disposition: attachment; filename=0xBDE49540.asc; size=5028 -----BEGIN PGP PUBLIC KEY BLOCK----- mQENBGDTzGEBCADHlXdS4V57s2soaEK2wi3o9rr9zo7to/giBSxCpFYJxOnPkL5A 2ibbvflrL8sWvAczx47wgDS7iIhzICBBRdnXtcFGnoeeriV27LSn+PcpnIB+DaWZ xe+6TDC0Z0JUJ7qDTjUBFzhnQGYlrVvc4WbnWTjJaB1LEwgIX8JqX5S3SX0/oXgs +OtqDuENZ4/a5te5xPnspTv/5NJHjqYGxjHP0Vw0KjRKS1AoJ1SBPSMQV5373AX9 5NzFS+CjqeQhjfHFPeRajQ8t4T6eqhKA7LtKMO1egeAwNehk9ZoEqEBT2+ojuKUd oSuzqvhhx+eUIYLFqoPSzMKR+YbStzergsbnABEBAAG0KUNocmlzIEh1dGNoaW5z b24gPGNocmlzaEB1bHRpbWF0ZWRucy5uZXQ+iQFrBBABCABVBgsJBwgDAgQVCAoC AxYCAQIZAQIbAwIeARgYaGtwczovL2tleXMub3BlbnBncC5vcmcWIQQGJAsyyBlk cuwsSYsYdR58veSVQAUCYNQl+wUJA8LAmgAKCRAYdR58veSVQN3NB/sFTeXrZeDk ml/dshET8QbkOPgXlnibk8+Mauf+y9LjS9WT7R8EmqhK7T7aw115JQ1RWTM6kpQM jyDBjYF7piJEpNKI9YDeSnODKir1fWQqm9+wd68wAKGvV4m8kg9uOHCvXG4J++MG zDFH+PuGVxKirFnaz46DpS0Zw7wTtjNiNFvCooYov3IeYGfqcchd3hwBuXgWLexZ vI8JW7lL9oXl7B/wcbSxg9rwy6/QLYGg6sEtYRcFYyvQWefSMJaLWjU/pZN2iSxM lXm55iZv1BXHupfeD1ldRiGs6ejrcpa8+U1ju291WbLzcIsU8IDljeW9/WB2dLFT hJmY1wRk158AtB5DaHJpcyA8YnNkLWxpc3RzQGJzZGZvcmdlLmNvbT6JAWgEEAEI AFIGCwkHCAMCBBUICgIDFgIBAhsDAh4BGBhoa3BzOi8va2V5cy5vcGVucGdwLm9y ZxYhBAYkCzLIGWRy7CxJixh1Hny95JVABQJg1CX7BQkDwsCaAAoJEBh1Hny95JVA aI0H/AlJAOfc5TcMKa479Itw31mwccKb+u0DPN9Gkm/RfWIBjeqqozxCM8G8jVFr dt/J6KmBO3dQtRZHlXdD57RAfDDl5Vm3uws0s+UIFOxMiua/YxyuDcKLsE8Bjkzx z+vuJ8f6cg4WlygPr3bo3l81AOuU/wOsTrNkQvVJxgATlooATSVxs0yNn2uoso9f nhMGUYsmT4c35JYh0k6Lq7Z2LS+ELipMTQ7M7iCWSP1O/zSEvPD4NBo52xCvjLka KcL4fRl7UN+6ouwGr5aUn83tztE/IR0AK45gFvL5yxI4g/zm1t3j2+hhhW1pBU8w uQWkD2DyLTWy7xs1uVF5m1ojHp60H0NocmlzIDxrbm90QHRhY29tYXdpcmVsZXNz Lm5ldD6JAWgEEAEIAFIGCwkHCAMCBBUICgIDFgIBAhsDAh4BGBhoa3BzOi8va2V5 cy5vcGVucGdwLm9yZxYhBAYkCzLIGWRy7CxJixh1Hny95JVABQJg1CX7BQkDwsCa AAoJEBh1Hny95JVA5m8H/iENaTD4j5QHfaHfiDIdxGx36GnETyRK0vAzr2b6pzG+ 7VHNCm4ZfuMsXDJ1ZD8fjTipvg0f4w31xCQI0NgNdAqudBqE075Jwcr9pE9j8VN1 Nvejto01cgLHODbLPhokrkFz1K023VjCdy5RaVuCZ6ajTif7Kq+BEOE8TumYx4ly zdhnh/9ICohqfVvEMh347wI36D7HuezHB773hOsHdqTy9T+0Qu0Vu+wud45MUy1f vRF11OkJFtKL0bh4yMSGVY1xte1Mt/qC6rd43TDtAW3ekw1o/exh764kp7XXQsmP wwe4Y040PZafcygJlEW9bBtjjxKnzDTvqeb5dMi6d7a0GENocmlzIDxvaWRldkBz dW5vcy5pbmZvPokBaAQQAQgAUgYLCQcIAwIEFQgKAgMWAgECGwMCHgEYGGhrcHM6 Ly9rZXlzLm9wZW5wZ3Aub3JnFiEEBiQLMsgZZHLsLEmLGHUefL3klUAFAmDUJfsF CQPCwJoACgkQGHUefL3klUB74wf8DSvT36bYZp7oqZ+35HNhTekJ2dbTzUhauF0S +Z9R1AGnNnINgua75CyQGdNCIgcZxo4qG9sePl7SllQ9i0qhmiw0mzmvky8bAZQV V/2Coc1C/81b+PI19VczYrbZC20jApsnbAIkKZgSh9XQoiLd3meY7G2lX2k6CXYL xSeBEh+N3BU8vLxExm82U71Qzm43u0kA1TlbTSqpBvg/tfAzTCsYQLSlB6b4ZL2W D6U7b7ZYF5oZNonVNWSHxpjUN3Evkta9xWS2+cgYQdlP1/ku5w5ZWwzmYG7awh0J /YuSNIp6Ks6D/PSBduu6XbH+FJHaXmq+ZCKpNBh5EKH+GhOfq7QfQ2hyaXMgPHBv cnRtYXN0ZXJAYnNkZm9yZ2UuY29tPokBaAQQAQgAUgYLCQcIAwIEFQgKAgMWAgEC GwMCHgEYGGhrcHM6Ly9rZXlzLm9wZW5wZ3Aub3JnFiEEBiQLMsgZZHLsLEmLGHUe fL3klUAFAmDUJfwFCQPCwJoACgkQGHUefL3klUC3GggAo4Y+hslaoV7Namp7qWYZ Vei4ZwPfsYW7/HtmFORSGV8C8xR+LSkwzN1Hc7Qxvwv+DXuk7Hzd1Ag/xe8XhbNG /NMrXENY/8ym9TRbxtrBIhQyhkyShSUT+N+g16GRNZKuNL2MOIHc/RCS/YyyaTtu TzIxFbP7Gb2LO1LiiZsFVOGirHfxyiww7CAm3HXY2K4smOiKs6swZMpStVy3dd6A BcB1LPGs3ywDglFfKCRbVmjsPgsi61r4kUBVO6ML7lAmPDXLXOa+7iAtBN479QxC MVeH3Y3SMrvu61Vyf1xL79rIznU3u8C34zfxqsoIV0zCZe2YDLbFfLhZYqatYYEo e7QjImNocmlzLmgiIDxjaHJpcy5oQHVsdGltYXRlZG5zLm5ldD6JAWgEEAEIAFIG CwkHCAMCBBUICgIDFgIBAhsDAh4BGBhoa3BzOi8va2V5cy5vcGVucGdwLm9yZxYh BAYkCzLIGWRy7CxJixh1Hny95JVABQJg1CX8BQkDwsCaAAoJEBh1Hny95JVAkUEH /jkzYrRh7muqoebwEgVeULzPbAs/nYJm9SMME2ypB2FS8kusO7lE+33UJO7PhHkJ 0nJ+tPfP8UV+fCzVjKjabzpvUGuiMWKRZEK9xNoxwi/epOrRw87msHA2LPqEob+F sVh09Nc58s75koUgSYp5h0FjsLK0+fwsQ6PtTfpY5W6JJVJRQnMwGKk5czrukBSM 79kJvphgul2xuzqo5K7rM98dL75AwCJmJZnbyXpUJIhtY/G01nURupBiQGgNixYs Zeo6OR669TFrMRWxueXtlHD0WaX7JNSlR5uyzpVaDCH0Kxa6ozmZtD+a6dAXg630 zbLGHg51JIm38Uvi1i47Jaa0KCJILlIuIENvbW11bmljYXRpb25zIiA8ZG5zQGRu c3dhdGNoLmNvbT6JAWgEEAEIAFIGCwkHCAMCBBUICgIDFgIBAhsDAh4BGBhoa3Bz Oi8va2V5cy5vcGVucGdwLm9yZxYhBAYkCzLIGWRy7CxJixh1Hny95JVABQJg1CX8 BQkDwsCaAAoJEBh1Hny95JVAABoH/iOWA+9BKxLIAIFgW2nxTFDrGvbxXL/mVSFt SOInKX8UqqfLCcikfpWLsj2D7mg5rKFMCu+31UYYlnrXl4YY1qruq0vh41L72qNy yHYol+xW4BSbZXf2q2ph7+lnPsFoodw7acVun5F8M8NH0roo5AOSbgRlK69ZFIcq fDEJdtk4oul7pqGArdeTCCdrSaeR3zrRN8P0PDOkGKSdlpeOE6XHnbbmAPZIhr/9 KsSpX1BGyipda3k5kOB4TsGVo+cRJMkK+GMpsZ+lJ7ZzRbjHbC+b52TiAIjMtXCK 3A3LrDUeMoJwvRKoO1tzquF6HqHJSg0ArZOvAB3BHlwUyUtA/o25AQ0EYNPMYQEI ANFpucNRdYEOubTNluoK97N9JmDb0WRXPPow+3XfBom6ZBSrWqNBgqDbjxSsLB00 QXbA8EB5W/Oolp/0epwEtgNAxyKVPowE/un+rY1PqvGjeAR4gBhY9Za1Lg1Q3vnR /WzsY7RIQCqhWUbfdGn1u6r/EgTBVrwUp4U/3ggfSz/PcUt4pUhlgxfYvjSjOgEZ wbqaQIwWud11FKMARNAUJzvJL/fDGeKLMvgRUwynIDGzCq7e67hhEEo5jwkZ0gEl 8RxXHKFuYkbb/q7rpdifXYYT6QCFlEZhiRbtH5Us7kgKuRD2XUFEQnN4U/rxuydH 4XOP6iOhiZfYnK/y9HBeRCMAEQEAAYkBPAQYAQgAJgIbDBYhBAYkCzLIGWRy7CxJ ixh1Hny95JVABQJg1CYkBQkDwsDDAAoJEBh1Hny95JVApBsH/iEg2ANRkHByfXB+ sH3PMf2Jsg5NSuj8OiNeKKGGIKCJkSAPjtv5rvKLNcvIcTR5Vnhr0e6AteFcK2te iFWDmj0QuFoQNvIOHQ3nHBPSpai2Ubq12nvYfg4bYK28AMi4xPMssgQ8awFgAI2V k9okq5XwC0Cc1MGhupEWYYSaFLIDQvFvRRSw1Lyc/W3SKa4d2dgesIPnB/rdv0Zq u8ftsSmurKxA2hQeNIcn06Ew7AbWUIjFX/bDXJlg/3Sj/spU2ur23TmaADBKhT5P DvfdaFTkk0SBfpN1j2S0DNXBHSrWvRp15zZmU4hwELiUY/H2/j/XpOGV3Q0i2iob 1hJ30C8= =aMQi -----END PGP PUBLIC KEY BLOCK----- --=_62d73a23d2cf4e003d136bc931a59f11-- From nobody Tue May 3 04:04:29 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E42351ACBA58 for ; Tue, 3 May 2022 04:04:33 +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 4KsmYs5wFKz4nYf; Tue, 3 May 2022 04:04:33 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651550673; 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=3BP219RQlkUFhHOAEZQXmvMN4KjUEQYOgLYLIdCs9/4=; b=krR3SBO3w2gHtYf4Lgm65FDm4BcD9g6WkyEypkv5X8aQxgiaQgXHDGidxvy3VQI9VOayad ar3Bh7kzM7fuVcccDRxPFis75FbCgCXnq1ycUqGnvOG7H+eLGR6w9fJzXTtoJdk3Lv3HOO JkkzlUeW8d2WfHm0xdIrIDcCmRtSU0KeMloZ15IrR5uAVUmp/EYYDUVGntRFLXPUWKx8y4 0+qcAQY8TYFfRBP136WyWxruQs28CJomRygWBRqVDjaVpfoDBIWwZPveU4pFZs5Zu5Dzqw duuyGyBRj5IaEIbHezC3upKze+hkkFGDjzeGH4cIhs4Mr0ESMseLftDYWzwJhg== Received: from auth2-smtp.messagingengine.com (auth2-smtp.messagingengine.com [66.111.4.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id A47D221B5F; Tue, 3 May 2022 04:04:33 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailauth.nyi.internal (Postfix) with ESMTP id 346AD27C0054; Tue, 3 May 2022 00:04:33 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Tue, 03 May 2022 00:04:33 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdeigdejlecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffokfgjfhggtgesthdtmh dtredttdenucfhrhhomheprfhhihhlihhpucfrrggvphhsuceophhhihhlihhpsehfrhgv vggsshgurdhorhhgqeenucggtffrrghtthgvrhhnpedvheehkefghfeiteehteduudeuhf dvgeettdeihfffleeuteeggeetuddttddufeenucffohhmrghinhepfhhrvggvsghsugdr ohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hphhhilhhiphdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihhthidqudduieeivdei vdegkedqvdefhedukedttdekqdhphhhilhhipheppehfrhgvvggsshgurdhorhhgsehtrh houhgslhgvrdhish X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 3 May 2022 00:04:32 -0400 (EDT) From: Philip Paeps To: Chris Cc: freebsd-git Subject: Re: When are the git servers available to obtain the ports tree? Date: Tue, 03 May 2022 12:04:29 +0800 X-Mailer: MailMate (1.14r5893) Message-ID: <1149BE63-059F-4093-B651-4DF2C413E012@freebsd.org> In-Reply-To: <26dc45b81218bd3b670145340035ad66@bsdforge.com> References: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> <81AFA1F5-E3EE-4E33-A2D7-58DB775674C3@freebsd.org> <26dc45b81218bd3b670145340035ad66@bsdforge.com> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651550673; 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=3BP219RQlkUFhHOAEZQXmvMN4KjUEQYOgLYLIdCs9/4=; b=XiN2sHJpizLd+D2yaMkvJ+Dw5cc4zMjc5m2wAPnNG84nGt40lhMy5dfUflG5WAHboIMp/z 965Id5yxGxEebk9JuZuyRCJh5W1EHi3TdRJ/lEcsnH5X3/fCHq+Y//ogryFg6XEPQ6kVG2 vQOZroFN0rNY+RlFlV8QiopFG6eYK6x07j3kEnncPBb10hvrrfaWTYLIomt7muSDya2+A+ 8HvI9BDxtmEm05WTHUXT/JKatC8gKc8G/Rt1GvZBBVsJlCyr+mIOfEEPMlXmwgQxUZOXFL tvwzbuqjkKJ2AWhmbaxe+tkkKxgMt9B56rXiHcjhbvyr1FxejfeDLn3FcPl1qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651550673; a=rsa-sha256; cv=none; b=wRHmQdBp3XVxnBvN4PE76WUDxNacgigRlPs/mb4ygjk/RCt0uqvkFQySBaK4URv0VrHZE3 gbev0QPx+LSAG3NHjkWewjzN7XMxMqeIYda3ve6szXIR1T/x7Sssm2qesUKZBGlkOjXcyL 3A+KyluNfWx0aNw/zRnM+0icaEPYvMbKTw/BA/hj30V4IkpGnV6MgTHXmwR4zlF7L9wevW 6pPtkR/rzac1UAG+qNwL5B+DUL25R9CCXT3m4bnWSUDaelcDz7i2bzB3koEdlJUYWTkcP2 h8L8GbKU72u1cA+elJz8tyC3k/RaqX72z8W6FZlUeXMoXY9G2WdVVtNhItuFWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 2022-05-03 11:44:14 (+0800), Chris wrote: > On 2022-05-02 18:42, Philip Paeps wrote: >> On 2022-05-03 01:27:39 (+0800), Chris wrote: >>> I'm a maintainer for well over 100 ports. But more often than >>> not, I am not permitted to obtain the ports tree from any of >>> the FreeBSD git servers: >>> >>> # git clone -o freebsd --config >>> remote.freebsd.fetch='+refs/notes/*:refs/notes/*' >>> https://git.freebsd.org/ports.git PORTS-20220502 >> > Thanks for the reply, Philip. >> Which mirror are you hitting? What does "host git.freebsd.org" say? > # host git.freebsd.org > git.freebsd.org is an alias for gitmir.geo.freebsd.org. > gitmir.geo.freebsd.org has address 149.20.1.203 > gitmir.geo.freebsd.org has IPv6 address 2001:4f8:1:11::e6a:1 > gitmir.geo.freebsd.org mail is handled by 0 Thanks. It looks like the 504 is sent by the mirror after all, and not a middlebox. Interestingly, it's most often sending it to you. Probably because you're the only one doing full clones regularly. The mirror isn't particularly busy. I'll look more closely after I have some lunch. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From nobody Tue May 3 07:48:35 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 52D171AB2FD3 for ; Tue, 3 May 2022 07:49:05 +0000 (UTC) (envelope-from dch@skunkwerks.at) Received: from wout4-smtp.messagingengine.com (wout4-smtp.messagingengine.com [64.147.123.20]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4KssXv6lxYz3nZ2 for ; Tue, 3 May 2022 07:49:03 +0000 (UTC) (envelope-from dch@skunkwerks.at) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 5AA4232009E8; Tue, 3 May 2022 03:48:56 -0400 (EDT) Received: from imap44 ([10.202.2.94]) by compute2.internal (MEProxy); Tue, 03 May 2022 03:48:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skunkwerks.at; h=cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1651564135; x=1651650535; bh=Q1rckjiy08 M9+bfHkzORBExZ/sctr+sFkx7+DDrwyt8=; b=RojQFhjlWcuaeXKD7pr2oY2/D2 ytrcfBkt9QXEFvm92+9zSkbRSfcuWHB+KnJI+QAX4toz2nnwmEeQdp8hyhB/N5va AKC3XyIbo88qFqlpiCBMglyBR8W/8bdHXOtunaR64rk4JZuaJ7FhiN4vSyytuUb7 Etd2J2KPuekKGIF4AgQcnp9zp/s4GF1hvwNwjpLBLkbzbRfJkjhZDW8c15Q0gC0W O21LOidxwV3+mThGqPPQYLmD9HNvRSrHJKeKhkDFUxiF+SmftYiZgzIoT0jX1ZOK J+hCzNtVAYbKJs5VfCDjUJPX4ZK4ffM+nQDU9/89iCCYkmLZ1+I4XP9d+adA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1651564135; x= 1651650535; bh=Q1rckjiy08M9+bfHkzORBExZ/sctr+sFkx7+DDrwyt8=; b=J 2pWEqruYMuMHy3RAXiIlfI9AGkNI+OkdzccWEOIn0S/3Kh84T9YYVeLflusbJIxR jXHQ+tL/OTb8Zhhj5rtzjFazpe/QlnF/o1Xo+AnEDC25qC6MuIvwLFtNJYKe2D4Z PoVYoSawWFvK61QTYZiZjceIgFdzeewxnkoppHTgsloRlC/0xMAdYQYPlSdUUzGi 5XCB5hPH/YTDHtG1q3pOdkuVXIZawkGepdLw5MX7IunSnYiODIsePzRORVKiVHGg uLIayFmMsk4UthXjnRw5uQol0R+oE2Hjar07iYr7Ge1oob8CjHvtQqfxKhzZjpKS EAF5WmrzdNZHnenAw9HVw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdeigdduvdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtsehttd ertderredtnecuhfhrohhmpedfffgrvhgvucevohhtthhlvghhuhgsvghrfdcuoegutghh sehskhhunhhkfigvrhhkshdrrghtqeenucggtffrrghtthgvrhhnpeejvdegvddvueeiue fgleegffeuuedugfekvedvkeegvdeivdegtdeluedufeevieenucffohhmrghinhepfhhr vggvsghsugdrohhrghdpghhithdqshgtmhdrtghomhenucevlhhushhtvghrufhiiigvpe dtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegutghhsehskhhunhhkfigvrhhkshdrrght X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 5F90F36A005C; Tue, 3 May 2022 03:48:55 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.7.0-alpha0-591-gfe6c3a2700-fm-20220427.001-gfe6c3a27 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org Mime-Version: 1.0 Message-Id: In-Reply-To: <1149BE63-059F-4093-B651-4DF2C413E012@freebsd.org> References: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> <81AFA1F5-E3EE-4E33-A2D7-58DB775674C3@freebsd.org> <26dc45b81218bd3b670145340035ad66@bsdforge.com> <1149BE63-059F-4093-B651-4DF2C413E012@freebsd.org> Date: Tue, 03 May 2022 07:48:35 +0000 From: "Dave Cottlehuber" To: freebsd-git@freebsd.org, bsd-lists@bsdforge.com Subject: Re: When are the git servers available to obtain the ports tree? Content-Type: text/plain X-Rspamd-Queue-Id: 4KssXv6lxYz3nZ2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=skunkwerks.at header.s=fm2 header.b=RojQFhjl; dkim=pass header.d=messagingengine.com header.s=fm1 header.b="J 2pWEqr"; dmarc=none; spf=pass (mx1.freebsd.org: domain of dch@skunkwerks.at designates 64.147.123.20 as permitted sender) smtp.mailfrom=dch@skunkwerks.at X-Spamd-Result: default: False [-2.59 / 15.00]; XM_UA_NO_VERSION(0.01)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.20]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[skunkwerks.at:+,messagingengine.com:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.20:from]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[skunkwerks.at:s=fm2,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[dch]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[skunkwerks.at]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git]; MID_RHS_WWW(0.50)[] X-ThisMailContainsUnwantedMimeParts: N On Tue, 3 May 2022, at 04:04, Philip Paeps wrote: >>>> I'm a maintainer for well over 100 ports. But more often than >>>> not, I am not permitted to obtain the ports tree from any of >>>> the FreeBSD git servers: >>>> >>>> # git clone -o freebsd --config >>>> remote.freebsd.fetch='+refs/notes/*:refs/notes/*' >>>> https://git.freebsd.org/ports.git PORTS-20220502 The initial full clone from github, of ports and/or src, often fails with gateway errors. I've bugged them in the past and they have amended their "limits" once, and given up the next time. I'm curious about the "shallow-info" appearing in your logs though. https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables There's extensive debugging for git, and for HTTP, you could try `GIT_CURL_VERBOSE=1` and see if that helps identify problems. I've previously seen gateway errors when the remote git server takes too long to prepare whatever packfile it needs to send me. I'm murky on git internals so I don't really understand what it's failing on. Generally, I only cloned a single branch, and fetch main, which seems to have removed issues for me, but I do this at least 1x/week. My freebsd remote is called upstream. # fetch a single branch instead of all branches git fetch upstream main # my snippet from /usr/ports/.git/config [remote "upstream"] url = https://git.freebsd.org/ports.git fetch = +refs/heads/main:refs/remotes/upstream/main fetch = +refs/notes/*:refs/notes/* pushurl = ssh://git@gitrepo.freebsd.org/ports.git [branch "upstream"] remote = upstream merge = refs/heads/main If, for some reason, you really need to do a from-scratch clone every time, it might be simpler to have a personal mirror of just the /main/ branch on github or similar, and avoid pulling the whole lot from the mirrors each time. You can also put `git fetch ` into a crontab and let it catch up daily and with less to fetch. A+ Dave From nobody Tue May 3 15:01:40 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4C7D51AC9BD3 for ; Tue, 3 May 2022 15:01:53 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (udns.ultimatedns.net [24.113.41.81]) (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 "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kt38J4Yxvz4RGs for ; Tue, 3 May 2022 15:01:52 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 243F1enM042982; Tue, 3 May 2022 08:01:51 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Tue, 03 May 2022 08:01:40 -0700 From: Chris To: Dave Cottlehuber Cc: freebsd-git@freebsd.org Subject: Re: When are the git servers available to obtain the ports tree? In-Reply-To: References: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> <81AFA1F5-E3EE-4E33-A2D7-58DB775674C3@freebsd.org> <26dc45b81218bd3b670145340035ad66@bsdforge.com> <1149BE63-059F-4093-B651-4DF2C413E012@freebsd.org> User-Agent: UDNSMS/17.0 Message-ID: <129a7e028a367648c0cb0c14f31d2a68@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: multipart/mixed; boundary="=_411fa3e4ba18abf87b73255b258be12e" X-Rspamd-Queue-Id: 4Kt38J4Yxvz4RGs X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] X-ThisMailContainsUnwantedMimeParts: N --=_411fa3e4ba18abf87b73255b258be12e Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2022-05-03 00:48, Dave Cottlehuber wrote: > On Tue, 3 May 2022, at 04:04, Philip Paeps wrote: >>>>> I'm a maintainer for well over 100 ports. But more often than >>>>> not, I am not permitted to obtain the ports tree from any of >>>>> the FreeBSD git servers: >>>>> >>>>> # git clone -o freebsd --config >>>>> remote.freebsd.fetch='+refs/notes/*:refs/notes/*' >>>>> https://git.freebsd.org/ports.git PORTS-20220502 > > The initial full clone from github, of ports and/or src, > often fails with gateway errors. I've bugged them in the > past and they have amended their "limits" once, and given > up the next time. > > I'm curious about the "shallow-info" appearing in your logs > though. Not sure what that meant either. The language is also not telling. > > https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables > > There's extensive debugging for git, and for HTTP, you > could try `GIT_CURL_VERBOSE=1` and see if that helps > identify problems. clusteradm was (is?) kind enough to try and pin it down. So we exchanged some info last night (mid day for them). I'll give your suggestion a try. Thanks. > > I've previously seen gateway errors when the remote git > server takes too long to prepare whatever packfile it > needs to send me. I'm murky on git internals so I don't > really understand what it's failing on. Make that 2 of us. > > Generally, I only cloned a single branch, and fetch main, > which seems to have removed issues for me, but I do this > at least 1x/week. My freebsd remote is called upstream. > > # fetch a single branch instead of all branches > > git fetch upstream main > > # my snippet from /usr/ports/.git/config > > [remote "upstream"] > url = https://git.freebsd.org/ports.git > fetch = +refs/heads/main:refs/remotes/upstream/main > fetch = +refs/notes/*:refs/notes/* > pushurl = ssh://git@gitrepo.freebsd.org/ports.git > > [branch "upstream"] > remote = upstream > merge = refs/heads/main > > If, for some reason, you really need to do a from-scratch > clone every time, it might be simpler to have a personal > mirror of just the /main/ branch on github or similar, and > avoid pulling the whole lot from the mirrors each time. While I *do* fetch the entire history. On average, I only ever do it at most, once a month. So I don't think it's unreasonable, or that I'm overloading the FreeBSD git services. ;-) I like you're personal mirror idea. In light of all this, I was also thinking I might just create a mirror to pull from on either my GitLab, or Codeberg account. But then that just felt like putting Duct Tape on the problem. Rather than understanding, and fixing it. :-) > > You can also put `git fetch ` into a > crontab and let it catch up daily and with less to fetch. > Really great suggestions, Dave. I'll probably at least adopt your .gitconfig and your GIT_CURL_VERBOSE=1 idea. Thanks for taking the time to reply! > A+ > Dave l8r, Chris --=_411fa3e4ba18abf87b73255b258be12e Content-Transfer-Encoding: 7bit Content-Type: application/pgp-keys; name=0xBDE49540.asc Content-Disposition: attachment; filename=0xBDE49540.asc; size=5028 -----BEGIN PGP PUBLIC KEY BLOCK----- mQENBGDTzGEBCADHlXdS4V57s2soaEK2wi3o9rr9zo7to/giBSxCpFYJxOnPkL5A 2ibbvflrL8sWvAczx47wgDS7iIhzICBBRdnXtcFGnoeeriV27LSn+PcpnIB+DaWZ xe+6TDC0Z0JUJ7qDTjUBFzhnQGYlrVvc4WbnWTjJaB1LEwgIX8JqX5S3SX0/oXgs +OtqDuENZ4/a5te5xPnspTv/5NJHjqYGxjHP0Vw0KjRKS1AoJ1SBPSMQV5373AX9 5NzFS+CjqeQhjfHFPeRajQ8t4T6eqhKA7LtKMO1egeAwNehk9ZoEqEBT2+ojuKUd oSuzqvhhx+eUIYLFqoPSzMKR+YbStzergsbnABEBAAG0KUNocmlzIEh1dGNoaW5z b24gPGNocmlzaEB1bHRpbWF0ZWRucy5uZXQ+iQFrBBABCABVBgsJBwgDAgQVCAoC AxYCAQIZAQIbAwIeARgYaGtwczovL2tleXMub3BlbnBncC5vcmcWIQQGJAsyyBlk cuwsSYsYdR58veSVQAUCYNQl+wUJA8LAmgAKCRAYdR58veSVQN3NB/sFTeXrZeDk ml/dshET8QbkOPgXlnibk8+Mauf+y9LjS9WT7R8EmqhK7T7aw115JQ1RWTM6kpQM jyDBjYF7piJEpNKI9YDeSnODKir1fWQqm9+wd68wAKGvV4m8kg9uOHCvXG4J++MG zDFH+PuGVxKirFnaz46DpS0Zw7wTtjNiNFvCooYov3IeYGfqcchd3hwBuXgWLexZ vI8JW7lL9oXl7B/wcbSxg9rwy6/QLYGg6sEtYRcFYyvQWefSMJaLWjU/pZN2iSxM lXm55iZv1BXHupfeD1ldRiGs6ejrcpa8+U1ju291WbLzcIsU8IDljeW9/WB2dLFT hJmY1wRk158AtB5DaHJpcyA8YnNkLWxpc3RzQGJzZGZvcmdlLmNvbT6JAWgEEAEI AFIGCwkHCAMCBBUICgIDFgIBAhsDAh4BGBhoa3BzOi8va2V5cy5vcGVucGdwLm9y ZxYhBAYkCzLIGWRy7CxJixh1Hny95JVABQJg1CX7BQkDwsCaAAoJEBh1Hny95JVA aI0H/AlJAOfc5TcMKa479Itw31mwccKb+u0DPN9Gkm/RfWIBjeqqozxCM8G8jVFr dt/J6KmBO3dQtRZHlXdD57RAfDDl5Vm3uws0s+UIFOxMiua/YxyuDcKLsE8Bjkzx z+vuJ8f6cg4WlygPr3bo3l81AOuU/wOsTrNkQvVJxgATlooATSVxs0yNn2uoso9f nhMGUYsmT4c35JYh0k6Lq7Z2LS+ELipMTQ7M7iCWSP1O/zSEvPD4NBo52xCvjLka KcL4fRl7UN+6ouwGr5aUn83tztE/IR0AK45gFvL5yxI4g/zm1t3j2+hhhW1pBU8w uQWkD2DyLTWy7xs1uVF5m1ojHp60H0NocmlzIDxrbm90QHRhY29tYXdpcmVsZXNz Lm5ldD6JAWgEEAEIAFIGCwkHCAMCBBUICgIDFgIBAhsDAh4BGBhoa3BzOi8va2V5 cy5vcGVucGdwLm9yZxYhBAYkCzLIGWRy7CxJixh1Hny95JVABQJg1CX7BQkDwsCa AAoJEBh1Hny95JVA5m8H/iENaTD4j5QHfaHfiDIdxGx36GnETyRK0vAzr2b6pzG+ 7VHNCm4ZfuMsXDJ1ZD8fjTipvg0f4w31xCQI0NgNdAqudBqE075Jwcr9pE9j8VN1 Nvejto01cgLHODbLPhokrkFz1K023VjCdy5RaVuCZ6ajTif7Kq+BEOE8TumYx4ly zdhnh/9ICohqfVvEMh347wI36D7HuezHB773hOsHdqTy9T+0Qu0Vu+wud45MUy1f vRF11OkJFtKL0bh4yMSGVY1xte1Mt/qC6rd43TDtAW3ekw1o/exh764kp7XXQsmP wwe4Y040PZafcygJlEW9bBtjjxKnzDTvqeb5dMi6d7a0GENocmlzIDxvaWRldkBz dW5vcy5pbmZvPokBaAQQAQgAUgYLCQcIAwIEFQgKAgMWAgECGwMCHgEYGGhrcHM6 Ly9rZXlzLm9wZW5wZ3Aub3JnFiEEBiQLMsgZZHLsLEmLGHUefL3klUAFAmDUJfsF CQPCwJoACgkQGHUefL3klUB74wf8DSvT36bYZp7oqZ+35HNhTekJ2dbTzUhauF0S +Z9R1AGnNnINgua75CyQGdNCIgcZxo4qG9sePl7SllQ9i0qhmiw0mzmvky8bAZQV V/2Coc1C/81b+PI19VczYrbZC20jApsnbAIkKZgSh9XQoiLd3meY7G2lX2k6CXYL xSeBEh+N3BU8vLxExm82U71Qzm43u0kA1TlbTSqpBvg/tfAzTCsYQLSlB6b4ZL2W D6U7b7ZYF5oZNonVNWSHxpjUN3Evkta9xWS2+cgYQdlP1/ku5w5ZWwzmYG7awh0J /YuSNIp6Ks6D/PSBduu6XbH+FJHaXmq+ZCKpNBh5EKH+GhOfq7QfQ2hyaXMgPHBv cnRtYXN0ZXJAYnNkZm9yZ2UuY29tPokBaAQQAQgAUgYLCQcIAwIEFQgKAgMWAgEC GwMCHgEYGGhrcHM6Ly9rZXlzLm9wZW5wZ3Aub3JnFiEEBiQLMsgZZHLsLEmLGHUe fL3klUAFAmDUJfwFCQPCwJoACgkQGHUefL3klUC3GggAo4Y+hslaoV7Namp7qWYZ Vei4ZwPfsYW7/HtmFORSGV8C8xR+LSkwzN1Hc7Qxvwv+DXuk7Hzd1Ag/xe8XhbNG /NMrXENY/8ym9TRbxtrBIhQyhkyShSUT+N+g16GRNZKuNL2MOIHc/RCS/YyyaTtu TzIxFbP7Gb2LO1LiiZsFVOGirHfxyiww7CAm3HXY2K4smOiKs6swZMpStVy3dd6A BcB1LPGs3ywDglFfKCRbVmjsPgsi61r4kUBVO6ML7lAmPDXLXOa+7iAtBN479QxC MVeH3Y3SMrvu61Vyf1xL79rIznU3u8C34zfxqsoIV0zCZe2YDLbFfLhZYqatYYEo e7QjImNocmlzLmgiIDxjaHJpcy5oQHVsdGltYXRlZG5zLm5ldD6JAWgEEAEIAFIG CwkHCAMCBBUICgIDFgIBAhsDAh4BGBhoa3BzOi8va2V5cy5vcGVucGdwLm9yZxYh BAYkCzLIGWRy7CxJixh1Hny95JVABQJg1CX8BQkDwsCaAAoJEBh1Hny95JVAkUEH /jkzYrRh7muqoebwEgVeULzPbAs/nYJm9SMME2ypB2FS8kusO7lE+33UJO7PhHkJ 0nJ+tPfP8UV+fCzVjKjabzpvUGuiMWKRZEK9xNoxwi/epOrRw87msHA2LPqEob+F sVh09Nc58s75koUgSYp5h0FjsLK0+fwsQ6PtTfpY5W6JJVJRQnMwGKk5czrukBSM 79kJvphgul2xuzqo5K7rM98dL75AwCJmJZnbyXpUJIhtY/G01nURupBiQGgNixYs Zeo6OR669TFrMRWxueXtlHD0WaX7JNSlR5uyzpVaDCH0Kxa6ozmZtD+a6dAXg630 zbLGHg51JIm38Uvi1i47Jaa0KCJILlIuIENvbW11bmljYXRpb25zIiA8ZG5zQGRu c3dhdGNoLmNvbT6JAWgEEAEIAFIGCwkHCAMCBBUICgIDFgIBAhsDAh4BGBhoa3Bz Oi8va2V5cy5vcGVucGdwLm9yZxYhBAYkCzLIGWRy7CxJixh1Hny95JVABQJg1CX8 BQkDwsCaAAoJEBh1Hny95JVAABoH/iOWA+9BKxLIAIFgW2nxTFDrGvbxXL/mVSFt SOInKX8UqqfLCcikfpWLsj2D7mg5rKFMCu+31UYYlnrXl4YY1qruq0vh41L72qNy yHYol+xW4BSbZXf2q2ph7+lnPsFoodw7acVun5F8M8NH0roo5AOSbgRlK69ZFIcq fDEJdtk4oul7pqGArdeTCCdrSaeR3zrRN8P0PDOkGKSdlpeOE6XHnbbmAPZIhr/9 KsSpX1BGyipda3k5kOB4TsGVo+cRJMkK+GMpsZ+lJ7ZzRbjHbC+b52TiAIjMtXCK 3A3LrDUeMoJwvRKoO1tzquF6HqHJSg0ArZOvAB3BHlwUyUtA/o25AQ0EYNPMYQEI ANFpucNRdYEOubTNluoK97N9JmDb0WRXPPow+3XfBom6ZBSrWqNBgqDbjxSsLB00 QXbA8EB5W/Oolp/0epwEtgNAxyKVPowE/un+rY1PqvGjeAR4gBhY9Za1Lg1Q3vnR /WzsY7RIQCqhWUbfdGn1u6r/EgTBVrwUp4U/3ggfSz/PcUt4pUhlgxfYvjSjOgEZ wbqaQIwWud11FKMARNAUJzvJL/fDGeKLMvgRUwynIDGzCq7e67hhEEo5jwkZ0gEl 8RxXHKFuYkbb/q7rpdifXYYT6QCFlEZhiRbtH5Us7kgKuRD2XUFEQnN4U/rxuydH 4XOP6iOhiZfYnK/y9HBeRCMAEQEAAYkBPAQYAQgAJgIbDBYhBAYkCzLIGWRy7CxJ ixh1Hny95JVABQJg1CYkBQkDwsDDAAoJEBh1Hny95JVApBsH/iEg2ANRkHByfXB+ sH3PMf2Jsg5NSuj8OiNeKKGGIKCJkSAPjtv5rvKLNcvIcTR5Vnhr0e6AteFcK2te iFWDmj0QuFoQNvIOHQ3nHBPSpai2Ubq12nvYfg4bYK28AMi4xPMssgQ8awFgAI2V k9okq5XwC0Cc1MGhupEWYYSaFLIDQvFvRRSw1Lyc/W3SKa4d2dgesIPnB/rdv0Zq u8ftsSmurKxA2hQeNIcn06Ew7AbWUIjFX/bDXJlg/3Sj/spU2ur23TmaADBKhT5P DvfdaFTkk0SBfpN1j2S0DNXBHSrWvRp15zZmU4hwELiUY/H2/j/XpOGV3Q0i2iob 1hJ30C8= =aMQi -----END PGP PUBLIC KEY BLOCK----- --=_411fa3e4ba18abf87b73255b258be12e-- From nobody Wed May 4 02:54:28 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 49C1E1ABCD6D for ; Wed, 4 May 2022 02:54:49 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4KtLyw2M1Fz4h8q for ; Wed, 4 May 2022 02:54:48 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 2442sSbc076614; Wed, 4 May 2022 02:54:28 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 2442sSCK076613; Tue, 3 May 2022 19:54:28 -0700 (PDT) (envelope-from david) Date: Tue, 3 May 2022 19:54:28 -0700 From: David Wolfskill To: Chris Cc: freebsd-git Subject: Re: When are the git servers available to obtain the ports tree? Message-ID: Reply-To: freebsd-git References: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Zfcy76YmnHl3KPcj" Content-Disposition: inline In-Reply-To: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> X-Rspamd-Queue-Id: 4KtLyw2M1Fz4h8q X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [-3.33 / 15.00]; HAS_REPLYTO(0.00)[freebsd-git@freebsd.org]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[catwhisker.org]; NEURAL_SPAM_SHORT(0.07)[0.068]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROMTLD(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; SUBJECT_ENDS_QUESTION(1.00)[]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --Zfcy76YmnHl3KPcj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, May 02, 2022 at 10:27:39AM -0700, Chris wrote: > I'm a maintainer for well over 100 ports. But more often than > not, I am not permitted to obtain the ports tree from any of > the FreeBSD git servers: >=20 > # git clone -o freebsd --config=20 > remote.freebsd.fetch=3D'+refs/notes/*:refs/notes/*'=20 > https://git.freebsd.org/ports.git PORTS-20220502 >=20 > returns: > error: RPC failed; HTTP 504 curl 22 The requested URL returned error: 504 > fatal: error reading section header 'shallow-info' >=20 > What is the charge for obtaining a current ports tree? Can I purchase an > annual subscription? >=20 > What else do I need to obtain the tree? > ..... FWIW, I maintain (what are referred to later in the thread as) "personal mirrors" (as I had with SVN, and CVS before that). And after having done so with git for a couple of years (? or so), I suddenly started getting some errors -- I don't recall whether they were what you report or not (I'm just back home after a couple of weeks 9 hours east of home, so my brain is less functional than ususal), but I had received a recommendation to run git maintenance run and git gc on my repos. Doing that appeared to prevent a recurrence of the issue, so I set up a cron task to do that on each repo every week. (Since the most critical time for me is the weekend, I do this in the "wee small hours" of Thursday morning -- which should allow me time to take evasive action (e.g., on Thursday or Friday) should something Go Wrong.) Looks as if I set this up back near the end of January; no issues with it so far since then. I scribbled some notes on how I do that at https://www.catwhisker.org/~david/FreeBSD/repo-sync.html -- in case that might be of interest or use. Peace, david --=20 David H. Wolfskill david@catwhisker.org V. Putin does not need "negotiations" to stop his own senseless war. See https://www.catwhisker.org/~david/publickey.gpg for my public key. --Zfcy76YmnHl3KPcj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iNUEARYKAH0WIQSr0Kzv+UJRY3wfOii0+6PfV4Ix1AUCYnHq5F8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0QUJE MEFDRUZGOTQyNTE2MzdDMUYzQTI4QjRGQkEzREY1NzgyMzFENAAKCRC0+6PfV4Ix 1KooAQDJmYJVUsfdbXVXQ887jWQ2rV+nvu/XhngUvELgtxsKywD/YUiAKfPxTOji RVdSQHTqrOpFePZFf4riw4AmpwFNYwA= =O9Rr -----END PGP SIGNATURE----- --Zfcy76YmnHl3KPcj-- From nobody Thu May 5 04:55:23 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EF7471ABC4DF for ; Thu, 5 May 2022 04:55:28 +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 4Kv1bh6FWxz4h3d; Thu, 5 May 2022 04:55:28 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651726528; 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=/ZCo/QNam56oHzsw4ymdguYMheVM2osgqqmeT4dSnTc=; b=VO/eSXpeV94cQRm7hHmYGkaM+rsSgNidHnjd80PTiPkEZIwmUggjpocSnKQEYaP6Sz4MJA VGNhCn1/775CrZcV7BL4fH9n7OHjMVtd0tAEi45J+4rCGv4w7hkOSCfmlexZ2byRZvmiv0 hugjdH/VbY86t4/WgNc1a1tYPc2lW4ZOIus0VSQylqMABYHYQZH0uZ07lDNTUupCI+oUp1 JMSeLALWqsZmnFQjU2sD9gM+yxrBcCaPHyzg6c9TozLdbuPpYlqzRKcL1l5z07wTpsxXyM iDcRu2Wtg7eMyswb6bh6sRCLtayXLCg9HvVwnE6xer4VrEVKq9xTLuS+BPR4sQ== Received: from auth2-smtp.messagingengine.com (auth2-smtp.messagingengine.com [66.111.4.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id AE68EC296; Thu, 5 May 2022 04:55:28 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailauth.nyi.internal (Postfix) with ESMTP id 3F8CC27C0054; Thu, 5 May 2022 00:55:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 05 May 2022 00:55:28 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedtgdekjecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffokfgjfhggtgesthdtmh dtredttdenucfhrhhomheprfhhihhlihhpucfrrggvphhsuceophhhihhlihhpsehfrhgv vggsshgurdhorhhgqeenucggtffrrghtthgvrhhnpefggfefieegtedtledtgfevtdfftd egvdehueeiteehteefieefveevtedvvdekgeenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehphhhilhhiphdomhgvshhmthhprghuthhhphgvrh hsohhnrghlihhthidqudduieeivdeivdegkedqvdefhedukedttdekqdhphhhilhhiphep pehfrhgvvggsshgurdhorhhgsehtrhhouhgslhgvrdhish X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 May 2022 00:55:26 -0400 (EDT) From: Philip Paeps To: Chris Cc: Dave Cottlehuber , freebsd-git@freebsd.org Subject: Re: When are the git servers available to obtain the ports tree? Date: Thu, 05 May 2022 12:55:23 +0800 X-Mailer: MailMate (1.14r5893) Message-ID: <3D669FAD-A5E0-43A1-B6F8-72E1541DD790@freebsd.org> In-Reply-To: <129a7e028a367648c0cb0c14f31d2a68@bsdforge.com> References: <7dc2545d68f3d4ebbedef4d29c6161f5@bsdforge.com> <81AFA1F5-E3EE-4E33-A2D7-58DB775674C3@freebsd.org> <26dc45b81218bd3b670145340035ad66@bsdforge.com> <1149BE63-059F-4093-B651-4DF2C413E012@freebsd.org> <129a7e028a367648c0cb0c14f31d2a68@bsdforge.com> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651726528; 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=/ZCo/QNam56oHzsw4ymdguYMheVM2osgqqmeT4dSnTc=; b=Tv3bhhPKsa8Y8wnAtDM5ceGUhL7XAB1YUsmZh/+ybaxpyvd148XPTg4Ix+HOOFK+LZAUt4 y+r1bq6BDCrl26H6o8MZSoqGsvTW082K0PCjlqhVPmomtMMMwVFu3XCYRbddBxxwd434+D LqhULpyoCVU2czQWr72SOYK8QF9c0kCGrIl46GeVglyZ5FiryHEazmtwIXpT56Ja944AWr MXbMS/++OVFGnwwkaai99rfBmiPCgT+ecof4n6INbI8qgHPwhsalBhPRgSlrTWJ8QuFwR/ VYPgzpryYvhcEH5H7OS1xKA+LBQAZPSqYjEEl2AM9J0DGsATodVetbTWZJuZ2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651726528; a=rsa-sha256; cv=none; b=aN+h/c+ThrxncB6Pn0st29zSWs4t0NvDYkls8OyF8Z+36l5HM6PCfXzReu+C+n6t4zqMsH lapaYJFg4rQ0UPohY6gqqycF2qbN9O7K71Y5TjoKYoqff3Zc+bvu2RBtf5dpxDYST/daAw 1vIaFZiG2LcgZhIlQawoIJtiOEGmuewWMSwL6poIfBojJc7Czfl2ITWgZqGCAk2OO/cpoZ QlD2uzIPLiEe4C+l114rHWs/GJyE6zpG+SEbJ+YXdKiQWYBRDN7wAk/BYq31hHa3cYyx3g U3L4JltCDwK+q0pATnnDEKy+6DBt9tw/jE7kOoHQ79dCHA9sHXObizf5TRGRQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 2022-05-03 23:01:40 (+0800), Chris wrote: > On 2022-05-03 00:48, Dave Cottlehuber wrote: >> There's extensive debugging for git, and for HTTP, you >> could try `GIT_CURL_VERBOSE=1` and see if that helps >> identify problems. > > clusteradm was (is?) kind enough to try and pin it down. So > we exchanged some info last night (mid day for them). I'll > give your suggestion a try. Thanks. I did some more testing. The problem seems to be that the mirror you are using is struggling with its workload. The machine is of an older generation and we're asking a lot of it. New hardware for that mirror is on our radar. Meanwhile, I'll try to find some time in the coming days to move the git mirror to another machine. This is a tedious chore and prone to being preempted by more fun things to do. Please poke me if it looks like I've forgotten. >> If, for some reason, you really need to do a from-scratch >> clone every time, it might be simpler to have a personal >> mirror of just the /main/ branch on github or similar, and >> avoid pulling the whole lot from the mirrors each time. > > While I *do* fetch the entire history. On average, I only ever > do it at most, once a month. So I don't think it's unreasonable, > or that I'm overloading the FreeBSD git services. ;-) I agree that it's not unreasonable. Thanks for reporting this problem. The Git mirrors are still a comparatively new workload on the mirrors. We clearly don't yet have enough monitoring in place to notice problems before users. Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From nobody Tue May 24 16:30:19 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AA0A21B3D4F8 for ; Tue, 24 May 2022 16:30:20 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from thebighonker.lerctr.org (thebighonker.lerctr.org [IPv6:2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4]) (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 "*.lerctr.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L706h0BYbz3Jkp for ; Tue, 24 May 2022 16:30:20 +0000 (UTC) (envelope-from jgh@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=ler2019; h=Content-Transfer-Encoding:Content-Type:Message-ID:Reply-To: Subject:To:From:Date:MIME-Version:Sender:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Lmq6wnUzGek7GcmXhA1Z2qBbdm+X/TUwylxA6bX1QY8=; b=y3ov5a9QTEzLDAJtSrvmYtLN34 mQMQ41UGYJX7LxPL2EeS/0mHiHnr5IwAN8uNpTqxW5TUmCmWPKxpeIUwb6XH/cRFC2b8He7MWaWGM pQ5FbFFJem7YexuaN3cEz7vOWIzDq5SqAa5zcFgOAlsFdQdbQ847cLmC3cpC+X84uH7IGno5ntqVw IRGFjWSpxF/4b+zV945UTN7ZrzRvyMsscgZNBAAb+WhrP36EKGhfvsrC5aVrAZo6UTrdYq0jQRbVH yBNhJG93W2aXalub/rQxEBCRWcZC028opK8q0wlAAz0NgbXMCcrDo18eyw6m6FfF9ldsiK8fzuBgc jhxn3XSw==; Received-SPF: softfail (thebighonker.lerctr.org: transitioning domain of FreeBSD.org does not designate 2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4 as permitted sender) client-ip=2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4; envelope-from=jgh@FreeBSD.org; helo=webmail.lerctr.org; Received: from thebighonker.lerctr.org ([2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4]:44753 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.95 (FreeBSD)) (envelope-from ) id 1ntXQJ-0005BL-Dd for freebsd-git@freebsd.org; Tue, 24 May 2022 11:30:19 -0500 Received: from 2600:6c52:7d7f:987b:655a:555a:fff2:22fd by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Tue, 24 May 2022 11:30:19 -0500 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Tue, 24 May 2022 09:30:19 -0700 From: jgh@FreeBSD.org To: Freebsd git Subject: git migration question, user Reply-To: jgh@FreeBSD.org Mail-Reply-To: jgh@FreeBSD.org Message-ID: <1f022b475ffaf1c13810416e837f5903@FreeBSD.org> X-Sender: jgh@FreeBSD.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4L706h0BYbz3Jkp X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=lerctr.org header.s=ler2019 header.b=y3ov5a9Q; dmarc=none; spf=softfail (mx1.freebsd.org: 2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4 is neither permitted nor denied by domain of jgh@FreeBSD.org) smtp.mailfrom=jgh@FreeBSD.org X-Spamd-Result: default: False [-3.30 / 15.00]; HAS_REPLYTO(0.00)[jgh@FreeBSD.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[lerctr.org:s=ler2019]; REPLYTO_EQ_FROM(0.00)[]; FREEFALL_USER(0.00)[jgh]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; ARC_NA(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[lerctr.org:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_NO_DN(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:55103, ipnet:2602:fcdb::/36, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Hi, An article I wrote some time ago depends on subversion. Specifically, this path: https://svn.freebsd.org/base/user Are there any plans on migrating 'user' to git? Thanks in advance! -jgh From nobody Tue May 24 17:13:35 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 618411B45F31 for ; Tue, 24 May 2022 17:13:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe2a.google.com (mail-vs1-xe2a.google.com [IPv6:2607:f8b0:4864:20::e2a]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L714q4cMtz3Q8c for ; Tue, 24 May 2022 17:13:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe2a.google.com with SMTP id j7so6842005vsp.12 for ; Tue, 24 May 2022 10:13:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=LQxmQflnIonVWwgnfTH4UW1VJwedOl1mIF4pipn/LRE=; b=dbzK/F7dIW4w5qmBmY1RARnYC1yQ2CRJXfRwk3GBLwfvqZ0sab8Zd7OWS3tG8W7A5g ICPWMba25efzDYH636pAP1bqnrSmR0/hw9jjCqjulx+KrHQoCCsvzjfpabnsYcbL9wsn EfFdMROC1+DC/MrdDlULfrb6aRhRFCUnTUrIWA0rOq7EnBiaMZVhnVaqFulX+2/4OzwI ilW9Yt1vZVBm5O0V8aRzxs0BgLIikKVzhH2flNoOsYx9oxQdMvgb2JFg6GWm/43kjtSX IX+e6j9WVEwEg9OfdMtPWpeT9bvob4kPE+lBlT8IO+Dj+HOfpIW4hoOybT9c3gn3X7s0 r1Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=LQxmQflnIonVWwgnfTH4UW1VJwedOl1mIF4pipn/LRE=; b=SIoCquu8nhi1vOI7wZaw+VvQcY30csme/GNV0DApZPb5eQzFxv7dEDPoYrWoBB34/9 UOLMlI1X47+gTigrYnBjn+HSD3yrdALuf3j+RYh9cCmV/DayrxTqe6lRDzmPsKu91vnC U/u4LpUX+qtj/tkt1gQsHVvojY6uZEhxJiwIPlOvCLGQ4nwo7XJExhUxQeoGXuG0wJP1 EI/ktfJ0lzfEu1HuRHp7zxOH1Hdpuwr4Y4asNsQ44HeMRCnOiN2WYhSa08WeNQgfiPlo lgtSW06MzrWGbo6AcB0iwWRnfgszXX7AKevlRB0QEdKb1HWmAM2a/7DiG4Xwftz5F0Cg tUkg== X-Gm-Message-State: AOAM533ICV6OooC1bouUqe2xo8OLoqT+w+XIOR13ZTAXq+IC4kU0gGA6 uqoBrc9IVyM8pJ1Ca6qJoRZ/iPXamu9C6mLVmK7wPw== X-Google-Smtp-Source: ABdhPJzGMDirx5rWtOvp6XiGi8CU6UBYqeJhoxYXPYupqW4OQfrB6DHhjStqL7TnBX2+FNIBAqi17nyZRSR4GLZjsrc= X-Received: by 2002:a05:6102:32c3:b0:337:cf2f:ef8f with SMTP id o3-20020a05610232c300b00337cf2fef8fmr3337883vss.17.1653412426686; Tue, 24 May 2022 10:13:46 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <1f022b475ffaf1c13810416e837f5903@FreeBSD.org> In-Reply-To: <1f022b475ffaf1c13810416e837f5903@FreeBSD.org> From: Warner Losh Date: Tue, 24 May 2022 11:13:35 -0600 Message-ID: Subject: Re: git migration question, user To: jgh@freebsd.org Cc: Freebsd git Content-Type: multipart/alternative; boundary="0000000000005c3b5e05dfc5148a" X-Rspamd-Queue-Id: 4L714q4cMtz3Q8c X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b="dbzK/F7d"; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::e2a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(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)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::e2a:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MLMMJ_DEST(0.00)[freebsd-git]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+,1:+,2:~]; 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] X-ThisMailContainsUnwantedMimeParts: N --0000000000005c3b5e05dfc5148a Content-Type: text/plain; charset="UTF-8" On Tue, May 24, 2022 at 10:30 AM wrote: > Hi, > > An article I wrote some time ago depends on subversion. Specifically, > this path: > > https://svn.freebsd.org/base/user > > Are there any plans on migrating 'user' to git? > There are no plans currently. The svn repo started at a time when third party hosting services was nil. Today there's a number of different third party hosting services (github, gitlab, codebase, sourceforge, etc), so we didn't build this service. Warner --0000000000005c3b5e05dfc5148a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, May 24, 2022 at 10:30 AM <= jgh@freebsd.org> wrote:
=
Hi,

An article I wrote some time ago depends on subversion. Specifically,
this path:

https://svn.freebsd.org/base/user

Are there any plans on migrating 'user' to git?

There are no plans currently. The svn repo started at a ti= me when third party hosting services was nil.
Today there's a= number of different third party hosting services (github, gitlab, codebase= , sourceforge,
etc), so we didn't build this service.

Warner=C2=A0
--0000000000005c3b5e05dfc5148a-- From nobody Tue May 24 17:18:08 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6970B1B469DC for ; Tue, 24 May 2022 17:18:15 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4L719y4CRVz3QdK; Tue, 24 May 2022 17:18:14 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 1B8223C0199; Tue, 24 May 2022 17:18:08 +0000 (UTC) Date: Tue, 24 May 2022 17:18:08 +0000 From: Brooks Davis To: jgh@FreeBSD.org Cc: Freebsd git Subject: Re: git migration question, user Message-ID: <20220524171808.GK15201@spindle.one-eyed-alien.net> References: <1f022b475ffaf1c13810416e837f5903@FreeBSD.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="OX2aLCKeO1apYW07" Content-Disposition: inline In-Reply-To: <1f022b475ffaf1c13810416e837f5903@FreeBSD.org> User-Agent: Mutt/1.9.4 (2018-02-28) X-Rspamd-Queue-Id: 4L719y4CRVz3QdK X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of brooks@spindle.one-eyed-alien.net has no SPF policy when checking 199.48.129.229) smtp.mailfrom=brooks@spindle.one-eyed-alien.net X-Spamd-Result: default: False [-1.90 / 15.00]; R_SPF_NA(0.00)[no SPF record]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[brooks]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; NEURAL_SPAM_SHORT(1.00)[0.996]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; MLMMJ_DEST(0.00)[freebsd-git]; FORGED_SENDER(0.30)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net]; RCVD_COUNT_ZERO(0.00)[0]; SIGNED_PGP(-2.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[brooks@freebsd.org,brooks@spindle.one-eyed-alien.net] X-ThisMailContainsUnwantedMimeParts: N --OX2aLCKeO1apYW07 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, May 24, 2022 at 09:30:19AM -0700, jgh@FreeBSD.org wrote: > Hi, >=20 > An article I wrote some time ago depends on subversion. Specifically,=20 > this path: >=20 > https://svn.freebsd.org/base/user >=20 > Are there any plans on migrating 'user' to git? Not at this time. We decided that (at least to start out) there are plenty of places for people to selfhost project branches (github.com, gitlab.com, etc). We might do this eventually if we host our own gitlab/getia/etc. -- Brooks --OX2aLCKeO1apYW07 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJijRNPAAoJEKzQXbSebgfAPJcIAI4C220/+Q7YsAJdnYdO50Ue WezDy5BM4mSvqpUrL75HJfHOLrAxZNentGhlXPYN9hXeWmEaA7Jp60opDwT70euP 6ZBKNiw660082Urug8TjyD5NUawOib0TbWVufdeFvW7gevdGxXqTCb31V4cUcjI+ yYx2yy9Fa+bIL3FopEzgc6Pu1aRl3cI8WEkg7ATAOwnfZOTbm98c89vfJgHSt7t0 9YgmKN0khAhFeEhFPPXiGtBGEF5o1ATERTKqoLNS0OLjx5oh9TFcIe8YlgKgnzN+ vle8zxt5nVD+c2nacbW10zl0q14fvOQcBStOiGMxckmqv0qoFitEy9gVccEOXx8= =gBXF -----END PGP SIGNATURE----- --OX2aLCKeO1apYW07-- From nobody Tue May 24 17:50:52 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 53D3E1B4DD5D for ; Tue, 24 May 2022 17:50:54 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from thebighonker.lerctr.org (thebighonker.lerctr.org [IPv6:2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4]) (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 "*.lerctr.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L71vd4PlJz3kyK; Tue, 24 May 2022 17:50:53 +0000 (UTC) (envelope-from jgh@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=ler2019; h=Content-Transfer-Encoding:Content-Type:Message-ID:References: In-Reply-To:Reply-To:Subject:Cc:To:From:Date:MIME-Version:Sender:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=zXAmUolvLt6pl+5cZP972/RjzaaTTL56GQqbadbczoY=; b=b5eE/Oqn0//GmFUQLWZz/DI7Wx gteSOfIgg50rRRAHbG23IGPRiG4POqdvPMueiQSXqPMYVlR/PxZJfe2KaxlOh+K7jEQz+RlcWJJ48 J3PibiHiQSRqLISp85q7J+YNZQvHXE2gaUDuyQBJvIazoFNXklmme6hsZ127dS3yJaw7Q/KoUqoZw qbLOuDmIvqseQQKoaY/0JHcftUwKoKz1jNwnhQP9QkgogLW40J1Fu9QeI2lQ2SxeZ6JmpIdfB9EBK OvzaIPYR7by8JrjIpWOtKPlGWUnHZJhYZp7OF6LQbu3s5EXOrPCUrJw3HKZJS1eZP8A/XG3j0Sok6 imeeO5Kw==; Received-SPF: softfail (thebighonker.lerctr.org: transitioning domain of FreeBSD.org does not designate 2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4 as permitted sender) client-ip=2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4; envelope-from=jgh@FreeBSD.org; helo=webmail.lerctr.org; Received: from thebighonker.lerctr.org ([2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4]:44231 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.95 (FreeBSD)) (envelope-from ) id 1ntYgH-00074A-1z; Tue, 24 May 2022 12:50:53 -0500 Received: from 2600:6c52:7d7f:987b:655a:555a:fff2:22fd by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Tue, 24 May 2022 12:50:52 -0500 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Tue, 24 May 2022 10:50:52 -0700 From: jgh@FreeBSD.org To: Brooks Davis Cc: Freebsd git Subject: Re: git migration question, user Reply-To: jgh@FreeBSD.org Mail-Reply-To: jgh@FreeBSD.org In-Reply-To: <20220524171808.GK15201@spindle.one-eyed-alien.net> References: <1f022b475ffaf1c13810416e837f5903@FreeBSD.org> <20220524171808.GK15201@spindle.one-eyed-alien.net> Message-ID: <7d2da291585c30e4b09f1a4f7126d590@FreeBSD.org> X-Sender: jgh@FreeBSD.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4L71vd4PlJz3kyK X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=lerctr.org header.s=ler2019 header.b="b5eE/Oqn"; dmarc=none; spf=softfail (mx1.freebsd.org: 2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4 is neither permitted nor denied by domain of jgh@FreeBSD.org) smtp.mailfrom=jgh@FreeBSD.org X-Spamd-Result: default: False [-3.30 / 15.00]; HAS_REPLYTO(0.00)[jgh@FreeBSD.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[lerctr.org:s=ler2019]; REPLYTO_EQ_FROM(0.00)[]; FREEFALL_USER(0.00)[jgh]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; ARC_NA(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[lerctr.org:+]; RCPT_COUNT_TWO(0.00)[2]; FROM_NO_DN(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.999]; MLMMJ_DEST(0.00)[freebsd-git]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:55103, ipnet:2602:fcdb::/36, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On 2022-05-24 10:18, Brooks Davis wrote: > On Tue, May 24, 2022 at 09:30:19AM -0700, jgh@FreeBSD.org wrote: >> Hi, >> >> An article I wrote some time ago depends on subversion. Specifically, >> this path: >> >> https://svn.freebsd.org/base/user >> >> Are there any plans on migrating 'user' to git? > > Not at this time. We decided that (at least to start out) there are > plenty of places for people to selfhost project branches (github.com, > gitlab.com, etc). We might do this eventually if we host our own > gitlab/getia/etc. > > -- Brooks Thanks for this note! I've reached out to security@, as well as Colin, to see if there is any planned movement for this code. -jgh From nobody Wed May 25 16:10:34 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B35471B4B38E for ; Wed, 25 May 2022 16:10:41 +0000 (UTC) (envelope-from jgh@FreeBSD.org) Received: from thebighonker.lerctr.org (thebighonker.lerctr.org [IPv6:2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4]) (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 "*.lerctr.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L7bdX5h5Zz4h7p; Wed, 25 May 2022 16:10:40 +0000 (UTC) (envelope-from jgh@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lerctr.org; s=ler2019; h=Content-Transfer-Encoding:Content-Type:Message-ID:References: In-Reply-To:Reply-To:Subject:Cc:To:From:Date:MIME-Version:Sender:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=9l6RDtIMxx0tubPDTvV36K8x+/Nqwx06JQXBrJCPf+A=; b=kYwg83sCT0PbAWGMPZri/tM8is 0Nq5tg9rgaxZdMd2c2Z4EDAEAK7kbnPWfgcq6aai78mvD3bnZGWI+GEGpj0fp3JJr3Kw2M8Gsepw7 La6fPCny8wsOhxfsz2PxUTnNr8cU1VzMcdY4cZQYjCV4KXoY41GdFCnLjUdyV7hlSItcccLvFWeX8 u/bF+UCzyC+b4tCUhPlo5vjD/guyVBc0LXLYjU55OXn4nMWQEAqsedX7R2CNVUv3TIDv8MWyFcmOB 3FMUm9Mm+Nh/bCB76ofznY2T4Di8E21c+FstsGIUyAiqSxh0ShZMR/+7txXHx05e2fr6TBXI8EEaZ 9zXg/B9A==; Received-SPF: softfail (thebighonker.lerctr.org: transitioning domain of FreeBSD.org does not designate 2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4 as permitted sender) client-ip=2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4; envelope-from=jgh@FreeBSD.org; helo=webmail.lerctr.org; Received: from thebighonker.lerctr.org ([2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4]:32936 helo=webmail.lerctr.org) by thebighonker.lerctr.org with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.95 (FreeBSD)) (envelope-from ) id 1nttak-000Hgx-AG; Wed, 25 May 2022 11:10:34 -0500 Received: from 097-093-027-127.res.spectrum.com ([97.93.27.127]) by webmail.lerctr.org with HTTP (HTTP/1.1 POST); Wed, 25 May 2022 11:10:34 -0500 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Wed, 25 May 2022 09:10:34 -0700 From: jgh@FreeBSD.org To: jgh@freebsd.org Cc: Brooks Davis , Freebsd git Subject: Re: git migration question, user Reply-To: jgh@FreeBSD.org Mail-Reply-To: jgh@FreeBSD.org In-Reply-To: <7d2da291585c30e4b09f1a4f7126d590@FreeBSD.org> References: <1f022b475ffaf1c13810416e837f5903@FreeBSD.org> <20220524171808.GK15201@spindle.one-eyed-alien.net> <7d2da291585c30e4b09f1a4f7126d590@FreeBSD.org> Message-ID: <0de8dc3aabb7cbeaafd8ef613f7e3429@FreeBSD.org> X-Sender: jgh@FreeBSD.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4L7bdX5h5Zz4h7p X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=lerctr.org header.s=ler2019 header.b=kYwg83sC; dmarc=none; spf=softfail (mx1.freebsd.org: 2602:fcdb:0:10:7ae3:b5ff:fe1b:23b4 is neither permitted nor denied by domain of jgh@FreeBSD.org) smtp.mailfrom=jgh@FreeBSD.org X-Spamd-Result: default: False [-3.30 / 15.00]; HAS_REPLYTO(0.00)[jgh@FreeBSD.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[lerctr.org:s=ler2019]; REPLYTO_EQ_FROM(0.00)[]; FREEFALL_USER(0.00)[jgh]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; ARC_NA(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DKIM_TRACE(0.00)[lerctr.org:+]; NEURAL_HAM_SHORT(-1.00)[-0.996]; FROM_NO_DN(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:55103, ipnet:2602:fcdb::/36, country:US]; RCVD_COUNT_TWO(0.00)[2]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[97.93.27.127:received] X-ThisMailContainsUnwantedMimeParts: N On 2022-05-24 10:50, jgh@FreeBSD.org wrote: > On 2022-05-24 10:18, Brooks Davis wrote: >> On Tue, May 24, 2022 at 09:30:19AM -0700, jgh@FreeBSD.org wrote: >>> Hi, >>> >>> An article I wrote some time ago depends on subversion. Specifically, >>> this path: >>> >>> https://svn.freebsd.org/base/user >>> >>> Are there any plans on migrating 'user' to git? >> >> Not at this time. We decided that (at least to start out) there are >> plenty of places for people to selfhost project branches (github.com, >> gitlab.com, etc). We might do this eventually if we host our own >> gitlab/getia/etc. >> >> -- Brooks > > Thanks for this note! I've reached out to security@, as well as Colin, > to see if there is any planned movement for this code. > > -jgh Updated documentation as applicable reference point has been moved. https://cgit.freebsd.org/doc/commit/?id=a9607c3d4645595c15dc7fb1fb1b1fbd8863254e -jgh From nobody Sat Jun 4 05:12:24 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 244A01BE063F for ; Sat, 4 Jun 2022 05:12:39 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (udns.ultimatedns.net [24.113.41.81]) (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 "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFSYf2bSwz4krM for ; Sat, 4 Jun 2022 05:12:37 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 2545CO8r001221 for ; Fri, 3 Jun 2022 22:12:30 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Fri, 03 Jun 2022 22:12:24 -0700 From: Chris To: freebsd-git Subject: date based checkouts in git possible? User-Agent: UDNSMS/17.0 Message-ID: <015e19843ec9a8fb8b72313f28ca131e@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: multipart/mixed; boundary="=_d6029980b4c869ca6e68eb6c18f40af5" X-Rspamd-Queue-Id: 4LFSYf2bSwz4krM X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] X-ThisMailContainsUnwantedMimeParts: N --=_d6029980b4c869ca6e68eb6c18f40af5 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed I'm in need of checking out the ports tree as it was at an earlier date. But for the life of me, I can't seem to cobble up an/the incantation. All the suggestions I've read indicate something to the effect of git checkout `git rev-list -n 1 --before=" freebsd/main` which returns Your branch is up to date with 'freebsd/main'. What must I do? Or will I need to convert/import it into svn? Thanks! Chris --=_d6029980b4c869ca6e68eb6c18f40af5 Content-Transfer-Encoding: 7bit Content-Type: application/pgp-keys; name=0xBDE49540.asc Content-Disposition: attachment; filename=0xBDE49540.asc; size=5028 -----BEGIN PGP PUBLIC KEY BLOCK----- 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 1hJ30C8= =aMQi -----END PGP PUBLIC KEY BLOCK----- --=_d6029980b4c869ca6e68eb6c18f40af5-- From nobody Sat Jun 4 06:09:32 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AEE811BE6286 for ; Sat, 4 Jun 2022 06:09:47 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic315-8.consmr.mail.gq1.yahoo.com (sonic315-8.consmr.mail.gq1.yahoo.com [98.137.65.32]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFTqZ547Zz4p0B for ; Sat, 4 Jun 2022 06:09:46 +0000 (UTC) (envelope-from marklmi@yahoo.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1654322978; bh=jwbIrSzp8xXOcKwqspVk5PF5yDvqFKOJb9aCrLLNpEg=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=cfCnz5Q1zx9UbI1R/LYhTrmP8pb2zgcTMxbmVdoSxfuWFbo2TD3CTs9v3qBXDxp8T+8E+B4Z6Z1B66uqnA9CQjGPkP3MbnYIpIkvXnK92atFy4XjAXgu+P5uZXdg9/J6Tsks4ambPdUbsB7kYBjLCSg+e2H2jvEUYhQ+FMfTyHNkVUgkeCCGj4NO/SEEx25JtJ9UL0LNg9VKsEf1zzdnZ+9QFq4klRy5aXWR/8MH55mbSAmC2Hwr7W7u+kUtw017dbNDL8N+OKjSYK94im89PkcfK447nogxqNUZo27ZYm2akgZ4fEFCpxGtlkoy0tWMFNdz/rorUyRX0PxwUL3XEQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1654322978; bh=b4dq1MdKfLvpb3GEpL2meeEgmem45l+pR/CmxI/KZQk=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=GvfXvqP6Fv/ydqoWvMHArHu3s4IG6y50LMJ49+i9LeIXVTUz1VgFxeoUnWNjrOpzQOelBj4ZMcrQ0rteYPgxU6gaenvjK3FMLkCKZmO6hMimZ4E33WZlzItZPMY2z5dHHfTG0FfTnAqRaa3+1iGuITQYv3QGz23eUAEYOXfEvDa/xDkApKyIbgtMGP/HEFsbuKC2Q/xnMYzCmQAykMzhzjIrYO9RQv3vpnR32xM34tNNgPt0qor47bL8Hd5zwLS373BZwraojxzbOt7ScF7JSS3eoMLtDU4wrHY0spS6S9NH2xBcpfBOgJ+JnVtj1cFXE4eaBDSVE2xeZUuJ5+dYHQ== X-YMail-OSG: XWMGE7gVM1nY0rpB_KF7uhLOGJLYtKXhKsMpeH8EkfGYBg3Ul0ZqsyaBRsti9Rs UXgDwznoSW4ficSy3XYUvIUz3KiURdMIXCEmKGE_7XuwDDH88mL.GGUGoz3ry9pzS7PPX5CoMMNE aKe22HYPwUpEwVdL6ha0hOnBAHu4gN9pxnDglBqgFKRe0IGVkp8m6CqN4ap8pPY8w4DHYMOL3gsA xZ5jwQaMMG3qegtn.F5hHCKE6l8eDwLsoMRLeH2bRCr_BVsAkiiMnEc2ptUeLj93UTg7xaoSqWAi 6taFISmTFRcBbHkIgIn0l4NlrKCoSNFjzB85hywt5GCWBUZ5pqXkTsJljk880vheM.2w.HPtzDhf QtgKq6S2i7VmoqL5ghk_szxOgZbCFDicTu1y4w2zHhvO6ES5TaqvB1UIF.FxVezh0aW8pDkLFy30 YeU31H4oRFjZZ9mbo_DDHJg5qhF28H_9bgVgs5AFqv6LavGzCIbuxkCYVl3dAfRilRAsKo4D1QO1 ERjp6neAygMvjgiqSeBzmq3Ocouf1AuL9.RwPLHLRHrpI5oMVPhEpO4Cgp723FnwtQda19ObnKe3 8exvBX9EBlU8ujP.lRvEZJ8ZlpL4OdDmfqmJyPXjZT6u_J4aC1jybRn69ynzy.zV6g3VxZHS0heP Ss_wGsPMoWX.3WyWzL7v0R6tICJCcyo2r1or2LE5fCwb72c5IqOQCxok88yHIDkalYOSlXQA_D5y yW9kMHYEs.kRF1IQ5neBzSno9NpPIHLiW5s57bqT4jZ0m_JR_jDHJB2NIQL4uWhgP4O6a6kViJPf _gkxDKDq3UHKa1IpWOHqOX3iKgnNLmkQ9FtB5e6uCmo8qnMD5zbHTYiDo8EVleNe5zmQVGZhRh1y qdJzkVjefpCf2VB.E64xm4gTZ2zYrHnJIDjm6UvbDUxJG_5Xil1l72RUYKjx8AqI5am0twS2vawL I2Ze.EvTebdcsfe7FSnLUZlHiJAdmkOXC7zF3IWvdFc36Iq7p00cf3WKzkZYVpiBWR.dbW7iL15k WkSnGPNJp2TH58TL6ngfXuYHLSfnyQVKen_.U7iGvpJXbCvxlSFpwjrVMswvGxb_Oh8oqBwCCp6y D40jH7t58fe3BSRSEo7n7fBoJ5Dy3op0Ba1q9n3HIHtGaC2BAsPtTEOyn8kgo_3sJi3jXX_PIPWi ilLUsya81KBVeJ2VlfaL6FjD6SVr6cTZx21rtxpd1x7SpWAukVY8A79x3mxMJVkxcmUHVh3oIVpd 3KWOavxiR0_B4x5JsBnXgPOmhb61SB6rzzEGlIMSrUA4__YAZ7i6fsyt8P64q7Xit0C8IQpZYVnh kVOOVOTvjGKVldKgszzviiVmsIaQzd4wNDlXut0lPn6ba1s508PgN9FaxK8HoFSnHuuuZPKU2pe4 DTYjTkNOwEyy49BnvmRg55h6nlvxhNe7Sx9adF0PctAWtX2Xh3Pp.qFrhn2P4sbk_zQ8e6BakiGE 0fVkiM6p1t9HcntpCGtJIDQxQhmxtJF2zgD4jQ3o.JKf5gxTmUVbdWpn8uwwEig4Ao9V7O49VpMx SIFcf6KKnTOS3qjSULEq6.6kaaE9MQFYiFImAlYKzEnwZKyGdH9Dx8HzD8RJcje9JiAmDl1ULslA bNKU3UFrGFrBmWxZ7pcItZwvFCLVTcHqTacLcjAI3HNN4VQ3Zhku1255RzOlAj1gcN8qgQcO8GbU 9MjSNy4gxRht9jgRbyJXW4BF6zLAhSvoctdVlkv9olMhYac_7THukhuwpAHRMdew_EEBjo0Gq3Rb 8MpftIwq76z4sNwFhvQmM1_mUcU_cydh5JO_J5eh9qlZlHTKOh4O.iqZaPFD16l6.irDbV5_fbWN CDEDr3EFGDh_ZD8U9.JBd9wZispC8S.Nq_catYO2I0NwSyAZ0hX72H2U_VxIi440Sxqa6DtzdtwW UR1qiYK6NEpFfyfQDWpzERyv1uyJAx5QHnPvv2GUHemhKWlw4pTb5Hyw7kChphAZG45lU8vykfUj btx3dfKoFtbOGd8a8mKAqj2_AvOpN3H._ja8AH4yZvKjKlwAG4BAHvLK_jtvBGd0WKWO8ra9f0yc 6Ko3i805W7IM99cCY.a3kuBxmLhJraniBXx.66NpFtZ1LUgr3cCuvDCB67BsPPwR.0_VGVmlFvg2 Nhc3IrTk0thmb06TWpk1bsaTN89x9oM5kbTS1EVYvixWokL963eXxOOqo.i0xbnyMrLgsrvh3RMq n4xaURMxY.D2lxLBs0_bP7QK.ucbOvzY6z.ESR2vNl7aXQxaCQxVLvaBWgG2i08mPD6P4G3T2iOe ip1XLWd15Ed.l5zn4hH1vgurpKv6mN6KY9u3S9Ie.J0A_tlIxahN2FIZJLuk- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.gq1.yahoo.com with HTTP; Sat, 4 Jun 2022 06:09:38 +0000 Received: by hermes--canary-production-gq1-54945cc758-xkjn5 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 782e2b41696d02f64c3ae9a8bd964fb1; Sat, 04 Jun 2022 06:09:33 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) Subject: Re: date based checkouts in git possible? From: Mark Millard In-Reply-To: <015e19843ec9a8fb8b72313f28ca131e@bsdforge.com> Date: Fri, 3 Jun 2022 23:09:32 -0700 Cc: freebsd-git Content-Transfer-Encoding: 7bit Message-Id: <4B22FF43-CEEA-4989-ACE7-F10E88EAF8BF@yahoo.com> References: <015e19843ec9a8fb8b72313f28ca131e@bsdforge.com> To: Chris X-Mailer: Apple Mail (2.3654.120.0.1.13) X-Rspamd-Queue-Id: 4LFTqZ547Zz4p0B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=cfCnz5Q1; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.65.32 as permitted sender) smtp.mailfrom=marklmi@yahoo.com X-Spamd-Result: default: False [-2.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-0.996]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; MID_RHS_MATCH_FROM(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; SUBJECT_ENDS_QUESTION(1.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.32:from]; MLMMJ_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N On 2022-Jun-3, at 22:12, Chris wrote: > I'm in need of checking out the ports tree as it was > at an earlier date. Do you not care which specific commit on the specific day (or other time interval)? Is this a one time thing? A regular procedure for varying dates? Something else? About how long ago is the date in question? Pre-git? Post-git? Is the branch known? main? A quarterly? (Which quarterly?) If it is a one time thing and recent enough, looking at the commits reported for the month via, say, something like: https://lists.freebsd.org/archives/dev-commits-ports-main/ or: https://lists.freebsd.org/archives/dev-commits-ports-branches/ should allow finding a commit-hash-prefix for something from the date in question. After that: normal git procedures. But it is not clear if your context fits that. > But for the life of me, I can't > seem to cobble up an/the incantation. > > All the suggestions I've read indicate something to > the effect of > git checkout `git rev-list -n 1 --before=" freebsd/main` > which returns > Your branch is up to date with 'freebsd/main'. > > What must I do? Or will I need to convert/import it into svn? > === Mark Millard marklmi at yahoo.com From nobody Sat Jun 4 06:13:37 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4BAB51BE62F4 for ; Sat, 4 Jun 2022 06:13:46 +0000 (UTC) (envelope-from unitrunker@gmail.com) Received: from mail-ot1-x335.google.com (mail-ot1-x335.google.com [IPv6:2607:f8b0:4864:20::335]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFTw95XvLz4pht for ; Sat, 4 Jun 2022 06:13:45 +0000 (UTC) (envelope-from unitrunker@gmail.com) Received: by mail-ot1-x335.google.com with SMTP id l9-20020a056830268900b006054381dd35so7005292otu.4 for ; Fri, 03 Jun 2022 23:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=o+hBRjNAOUxa7FCjE+yuSvibo3V7NSrrvNettIGOiXM=; b=YfUw7qIdqYDgC9JLpI6oIvwaeshGIsPUWHT+NP0jL4b3jUednawLOiB41Kh2OT/MEQ gwLxmv6JegMUiJSJHDCxB6/ZOhplxT5ll2oN0NHBJTj5Ny2G/17TLz/KozPFuitb/lJt 8ErGX+GYOLU6KoNU6rxpypfj9CTT+wKyPUr7lwopWpYNi6S+ewZLGl1+ym9cNbARbrse QhUieJ4ar5ZTo3EeC+Av8ds92Bz8kkmDywqJcQvS/YIs8NUxU3fkeskVnR+zp+iMSAvN njMOgqt6+4kCg63m1TCKeUdOkMVPv1U3PUhKYpWqeDYeYTRcwsu3sJCIGXHRmn1xBEGE 1jEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=o+hBRjNAOUxa7FCjE+yuSvibo3V7NSrrvNettIGOiXM=; b=e4T9vw/VBVuhcOvD2vGeXuthfG/w/jIS/9zZAILDu4ywZE5aPNcK7ztT4Myl3+hyLW 6qebXnake2ths2IbJQOOGnMnPVwDjWZa8ZD2UVHSo5bh85OMpHJgeqkii8DZBRhuKtRp 3XQNLIXv0Y+W9pHzKKcn0NCQtDqPhkD2nLW1rrGCwPQeFZW+BIhbJEwo+Yi1VRq8krQR W6Ef1rrV4o5D77gPPPHW57oDdBTzUYZXZG5gIxFR8Rq6+ATTdqKmlmThtfmO9Txud4fs 0SiqjVG2fv0p9FhZuhlqaR8WpQfHncvKP11WE8UQ0QGztu3sw0l6XF2ZeXdZ+oEQREpV ksbQ== X-Gm-Message-State: AOAM531/yiL1y74eF+kqnqp1DWPZwdeiI/ElOR3Uk/yXj133IhJBstfm 9hVVoGQxzg17X7kT8w+r2X1aEc1cHoQ= X-Google-Smtp-Source: ABdhPJx/28vtUqSWTa3AdJLPhqXCwwUK0rlYIz/e2EyZsNEuNpEwm0OP5WWRGU+1C5zrnw5rJMYnvQ== X-Received: by 2002:a9d:70c9:0:b0:60b:111f:7dc0 with SMTP id w9-20020a9d70c9000000b0060b111f7dc0mr5514779otj.140.1654323218858; Fri, 03 Jun 2022 23:13:38 -0700 (PDT) Received: from [10.2.0.2] ([89.187.175.132]) by smtp.gmail.com with ESMTPSA id t18-20020a4adbd2000000b0040eb1d3f43dsm4825160oou.2.2022.06.03.23.13.38 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 03 Jun 2022 23:13:38 -0700 (PDT) Message-ID: <107e26aa-77de-c195-e40b-2460f3a68164@gmail.com> Date: Sat, 4 Jun 2022 01:13:37 -0500 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: date based checkouts in git possible? Content-Language: en-US To: freebsd-git@freebsd.org References: <015e19843ec9a8fb8b72313f28ca131e@bsdforge.com> From: Unit Runker In-Reply-To: <015e19843ec9a8fb8b72313f28ca131e@bsdforge.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4LFTw95XvLz4pht X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=YfUw7qId; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of unitrunker@gmail.com designates 2607:f8b0:4864:20::335 as permitted sender) smtp.mailfrom=unitrunker@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-0.999]; RECEIVED_SPAMHAUS_PBL(0.00)[89.187.175.132:received]; SUBJECT_ENDS_QUESTION(1.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; 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]; RCPT_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::335:from]; MLMMJ_DEST(0.00)[freebsd-git]; RCVD_TLS_ALL(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On 6/4/2022 12:12 AM, Chris wrote: > git checkout `git rev-list -n 1 --before=" freebsd/main` > which returns > Your branch is up to date with 'freebsd/main'. > > What must I do? Or will I need to convert/import it into svn? Hi Chris; The message above makes me think the hash returned by rev-list is also HEAD. Do this: git fetch && git pull ... to make sure your cloned repo is up to date. To do work with the branch in that state, I'd create a new branch based on the commit hash returned by rev-list. If you just want to build the kernel, the git-checkout command you gave above should result in your working copy being in a detached head state which is probably what you wanted. From nobody Sat Jun 4 06:26:43 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6FBF61BE795E for ; Sat, 4 Jun 2022 06:26:51 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (udns.ultimatedns.net [24.113.41.81]) (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 "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFVCH0tvQz4q9W for ; Sat, 4 Jun 2022 06:26:50 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 2546Qipn036100; Fri, 3 Jun 2022 23:26:50 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Fri, 03 Jun 2022 23:26:43 -0700 From: Chris To: Mark Millard Cc: freebsd-git Subject: Re: date based checkouts in git possible? In-Reply-To: <4B22FF43-CEEA-4989-ACE7-F10E88EAF8BF@yahoo.com> References: <015e19843ec9a8fb8b72313f28ca131e@bsdforge.com> <4B22FF43-CEEA-4989-ACE7-F10E88EAF8BF@yahoo.com> User-Agent: UDNSMS/17.0 Message-ID: X-Sender: bsd-lists@bsdforge.com Content-Type: multipart/mixed; boundary="=_6346913b50aeb5c2150655103667512e" X-Rspamd-Queue-Id: 4LFVCH0tvQz4q9W X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] X-ThisMailContainsUnwantedMimeParts: N --=_6346913b50aeb5c2150655103667512e Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2022-06-03 23:09, Mark Millard wrote: > On 2022-Jun-3, at 22:12, Chris wrote: > >> I'm in need of checking out the ports tree as it was >> at an earlier date. > > Do you not care which specific commit on the specific day > (or other time interval)? > > Is this a one time thing? A regular procedure for varying > dates? Something else? > > About how long ago is the date in question? Pre-git? > Post-git? > > Is the branch known? main? A quarterly? (Which quarterly?) > > If it is a one time thing and recent enough, looking at > the commits reported for the month via, say, something like: > > https://lists.freebsd.org/archives/dev-commits-ports-main/ > or: > https://lists.freebsd.org/archives/dev-commits-ports-branches/ > > should allow finding a commit-hash-prefix for something from > the date in question. After that: normal git procedures. But > it is not clear if your context fits that. Thank you very much for the infrmitive reply, Mark. It turns out that the date of the commit I need is *just* prior to the git changeover. So I'm lucky enough to get it with svn -- which I happen to know the incantation for. Thanks for providing me the info I needed to figure that out. :-) > === > Mark Millard > marklmi at yahoo.com Chris --=_6346913b50aeb5c2150655103667512e Content-Transfer-Encoding: 7bit Content-Type: application/pgp-keys; name=0xBDE49540.asc Content-Disposition: attachment; filename=0xBDE49540.asc; size=5028 -----BEGIN PGP PUBLIC KEY BLOCK----- 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 1hJ30C8= =aMQi -----END PGP PUBLIC KEY BLOCK----- --=_6346913b50aeb5c2150655103667512e-- From nobody Sat Jun 4 14:49:49 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3DEC01BD0125 for ; Sat, 4 Jun 2022 14:50:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa2b.google.com (mail-vk1-xa2b.google.com [IPv6:2607:f8b0:4864:20::a2b]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFjMy4D8Pz3K4W for ; Sat, 4 Jun 2022 14:50:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa2b.google.com with SMTP id e7so4583523vkh.2 for ; Sat, 04 Jun 2022 07:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=xfle/cW9dbvGLYU6DHh7/d+B0RhgZe4ENyct7TLtFqY=; b=APHAQmnGAKvkXVu/a9jOdJKBjwsGnqXTEun/CE4EU3wT7pv+65Owab8awpY1BKYv9e 6k0PpFPRIB+TlIAt+UCkt2UPkgWBL7gO+5v0PAYixjAljcpE1EFD/zf4Zis2SQ8Tcuje 0YvHPBLAdN6ZbmoYM5fOUatzzOUH56PQPPcA4geZQQNYCwEXMK0IDNGJBUY28+Cd5hXU kCqEGqk6If8xwBajA2aMOCEK7yInOFcPxZVQpHaifG799Qz3pBnX297BulcL2r/rRlj2 QzuifihaQt52ZsjgRJm9RbqWcjQBi/UBVmJYqDBfxbtyWiZXsEm9pGDR4T11zmnsZvok jm+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=xfle/cW9dbvGLYU6DHh7/d+B0RhgZe4ENyct7TLtFqY=; b=q/gfSTQmcWOuiZpdlYVtIfvvhdI6yDBCwTiC4pkKoXUdQ2oQiNMwEZ/UQ70rt0Y9GL DZbxJGtnQ/ED4eHmTIOgWMGnW69TSD/1b5iVizkTKfFtwDbmPSd5OWMLnvzBo0RMp+NI 0OkORkO8ay0v9MgkRrE9nkSQM1wSWhVBekbm8XqmDA4MkW3/Llbvw9aph++HQ3FrsC5f e0xX66xCiSIuhBofzZM1XYiUBne2o67n+cjbcf7cEgo9iosahNOJacvcaLh5j/hVME0T a4A/CZsc6SPPwbKj7CgjEY8RDFMzhVG0HafZgs3EUH6FJw5sXBBm9bqGIyKgYlUQnJ24 q/QQ== X-Gm-Message-State: AOAM531TjhDS9LwIGamBpCdFwHLch7X2ix5K+reMJGMJ2/xKpFjI7gyf oTJgqXILO+jJ2EsfzY9UMUMEXfdLeFhOjZFVyZq7mt3CaaU= X-Google-Smtp-Source: ABdhPJztNc7lOpFDA0M2MDSgbJ7DRDl/hXzxzsyNUHscPhDjrTT28v6gJDdOMQ8T3cZHXaGjwKjRVPsxorevWefBtLA= X-Received: by 2002:a1f:4646:0:b0:35c:f391:4c24 with SMTP id t67-20020a1f4646000000b0035cf3914c24mr6276778vka.34.1654354200334; Sat, 04 Jun 2022 07:50:00 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <015e19843ec9a8fb8b72313f28ca131e@bsdforge.com> In-Reply-To: <015e19843ec9a8fb8b72313f28ca131e@bsdforge.com> From: Warner Losh Date: Sat, 4 Jun 2022 08:49:49 -0600 Message-ID: Subject: Re: date based checkouts in git possible? To: Chris Cc: freebsd-git Content-Type: multipart/alternative; boundary="00000000000071aab605e0a05aa6" X-Rspamd-Queue-Id: 4LFjMy4D8Pz3K4W X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=APHAQmnG; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::a2b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-1.61 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; NEURAL_HAM_MEDIUM(-0.61)[-0.607]; FROM_HAS_DN(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)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::a2b:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MLMMJ_DEST(0.00)[freebsd-git]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+,1:+,2:~]; SUBJECT_ENDS_QUESTION(1.00)[]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] X-ThisMailContainsUnwantedMimeParts: N --00000000000071aab605e0a05aa6 Content-Type: text/plain; charset="UTF-8" On Fri, Jun 3, 2022 at 11:17 PM Chris wrote: > I'm in need of checking out the ports tree as it was > at an earlier date. But for the life of me, I can't > seem to cobble up an/the incantation. > > All the suggestions I've read indicate something to > the effect of > git checkout `git rev-list -n 1 --before=" freebsd/main` > which returns > Your branch is up to date with 'freebsd/main'. > > What must I do? Or will I need to convert/import it into svn? > git checkout main@{} You may need to protect the {} from csh/tcsh eating them. You can also add a time. See the git-rev-parse man page for all the details. Note, due to the temporal anomalies that sometimes are present in git, the commit date and the author date differ, which can cause confusion if you do a git log and not a git log --prety=fuller. Warner --00000000000071aab605e0a05aa6 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Fri, Jun 3, 2022 at 11:17 PM Chris= <bsd-lists@bsdforge.com&g= t; wrote:
I'= m in need of checking out the ports tree as it was
at an earlier date. But for the life of me, I can't
seem to cobble up an/the incantation.

All the suggestions I've read indicate something to
the effect of
git checkout `git rev-list -n 1 --before=3D<previous-date>" free= bsd/main`
which returns
Your branch is up to date with 'freebsd/main'.

What must I do? Or will I need to convert/import it into svn?

git checkout main@{<date>}

You may need to protect the {} from csh/tcsh eating them. You can als= o add a time.
See the git-rev-parse man page for all the details.=

Note, due to the temporal anomalies that sometime= s are present in git,
the commit date and the author date differ,= which can cause confusion
if you do a git log and not a git log = --prety=3Dfuller.

Warner=C2=A0
--00000000000071aab605e0a05aa6-- From nobody Sun Jun 5 04:46:21 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F0FDA1BD03E9 for ; Sun, 5 Jun 2022 04:46:31 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (udns.ultimatedns.net [24.113.41.81]) (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 "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LG3x31zfQz3w0p for ; Sun, 5 Jun 2022 04:46:31 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 2554kLC5008045; Sat, 4 Jun 2022 21:46:28 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Date: Sat, 04 Jun 2022 21:46:21 -0700 From: Chris To: Warner Losh Cc: freebsd-git Subject: Re: date based checkouts in git possible? In-Reply-To: References: <015e19843ec9a8fb8b72313f28ca131e@bsdforge.com> User-Agent: UDNSMS/17.0 Message-ID: <4670b45f3e08810720a5c62e9b098f05@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: multipart/mixed; boundary="=_12f95faf6050ed5e1c76d6893cee8cba" X-Rspamd-Queue-Id: 4LG3x31zfQz3w0p X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] X-ThisMailContainsUnwantedMimeParts: N --=_12f95faf6050ed5e1c76d6893cee8cba Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed On 2022-06-04 07:49, Warner Losh wrote: > On Fri, Jun 3, 2022 at 11:17 PM Chris wrote: > >> I'm in need of checking out the ports tree as it was >> at an earlier date. But for the life of me, I can't >> seem to cobble up an/the incantation. >> >> All the suggestions I've read indicate something to >> the effect of >> git checkout `git rev-list -n 1 --before=" freebsd/main` >> which returns >> Your branch is up to date with 'freebsd/main'. >> >> What must I do? Or will I need to convert/import it into svn? >> > > git checkout main@{} Brilliant! > > You may need to protect the {} from csh/tcsh eating them. Yep. I did. > You can also add a time. > See the git-rev-parse man page for all the details. > > Note, due to the temporal anomalies that sometimes are present in git, > the commit date and the author date differ, which can cause confusion > if you do a git log and not a git log --prety=fuller. Thanks, Warner. That's the magic incantation I needed. I'll add it to my list. Sorry for the bother. But the svn way of looking/thinking is still pretty ingrained and I struggle with events in history being a HoH as opposed to a date. > > Warner Thanks again! Chris --=_12f95faf6050ed5e1c76d6893cee8cba Content-Transfer-Encoding: 7bit Content-Type: application/pgp-keys; name=0xBDE49540.asc Content-Disposition: attachment; filename=0xBDE49540.asc; size=5028 -----BEGIN PGP PUBLIC KEY BLOCK----- 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 1hJ30C8= =aMQi -----END PGP PUBLIC KEY BLOCK----- --=_12f95faf6050ed5e1c76d6893cee8cba-- From nobody Thu Jun 23 23:17:33 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 07055862326 for ; Thu, 23 Jun 2022 23:17:40 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from www541.your-server.de (www541.your-server.de [213.133.107.7]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4LTbkp6Nhqz3GWv for ; Thu, 23 Jun 2022 23:17:35 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from sslproxy03.your-server.de ([88.198.220.132]) by www541.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o4W4r-000CcP-Qw for freebsd-git@FreeBSD.org; Fri, 24 Jun 2022 01:17:33 +0200 Received: from [188.167.171.2] (helo=[10.0.9.146]) by sslproxy03.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o4W4r-0005gY-Ml for freebsd-git@FreeBSD.org; Fri, 24 Jun 2022 01:17:33 +0200 Message-ID: Date: Fri, 24 Jun 2022 01:17:33 +0200 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Content-Language: en-US To: freebsd-git From: Martin Matuska Subject: Merge of vendor/openzfs/zfs-2.1-relesae to stable/13 forbidden Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Authenticated-Sender: martin@matuska.de X-Virus-Scanned: Clear (ClamAV 0.103.6/26581/Thu Jun 23 10:07:07 2022) X-Rspamd-Queue-Id: 4LTbkp6Nhqz3GWv X-Spamd-Bar: ++ Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 213.133.107.7 is neither permitted nor denied by domain of mm@FreeBSD.org) smtp.mailfrom=mm@FreeBSD.org X-Spamd-Result: default: False [2.56 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[mm]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; R_SPF_SOFTFAIL(0.00)[~all]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; NEURAL_SPAM_MEDIUM(0.92)[0.921]; NEURAL_SPAM_LONG(1.00)[0.999]; NEURAL_SPAM_SHORT(0.73)[0.735]; MLMMJ_DEST(0.00)[freebsd-git]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE]; RCVD_TLS_ALL(0.00)[]; HAS_X_AS(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Hello, there has been probably some change in configuration as I am not allowed to merge vendor/openzfs/zfs-2.1-release to stable/13 anymore. Please could anyone responsible take a look at this? remote: ================================================================ remote: Currently only allow merge from vendor/* to main remote: ================================================================ remote: FATAL: VREF/MERGE-CHECK/src: helper program exit status 256 remote: error: hook declined to update refs/heads/stable/13 To ssh://gitrepo.FreeBSD.org/src.git  ! [remote rejected]           stable/13 -> stable/13 (hook declined) error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/src.git' Thanks mm From nobody Fri Jun 24 14:52:05 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EF7E387A9FA for ; Fri, 24 Jun 2022 14:52:18 +0000 (UTC) (envelope-from lwhsu@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 4LV0TG6CXBz4sb9; Fri, 24 Jun 2022 14:52:18 +0000 (UTC) (envelope-from lwhsu@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656082338; 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=f6Eg588moExQ4U1IJfJFPAswBCLE4a+3Bc2xtc8366M=; b=s4BdjadmhFk920XauLwXXc1/CAzAleDzwaUFHtY0gTQzYLyYWiSioay+ENV0dGDfXNau1g ErL0teSfnhNiCBG4iyV5SqktIUPhJXdYiVeVfUSJctgVnid15AwUuIIyUarE0U8qAEmrgp bo5llY+I6WJda5t80F+beVJ07lXobTEgVwBIQgErnh1G3PRsuPxRpTUwa4kG1cvh1h2bBL 9dLnrWA9FUgbW8ff0M+tKm/clcCGZz3qS9IOuoysHz4X+WBpDO3EbO0O2yGZXLTc3OYYQm KuCvllfe+Y7rF+XflWt6kMq3xiQ4aBk06Th5e/l5Vwx76waeCrstfSQ10Ao70Q== Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id B4940C717; Fri, 24 Jun 2022 14:52:18 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-ej1-f45.google.com with SMTP id pk21so5248859ejb.2; Fri, 24 Jun 2022 07:52:18 -0700 (PDT) X-Gm-Message-State: AJIora/X+DZ1gPCoI8i7YF6EZY7CEVi5/Fo/FgRGXo+nrZMqPooTShNZ DLNvof0eoP96haZKWQqVsh7ycmVpH3PYI4O6N+w= X-Google-Smtp-Source: AGRyM1siaDpz22wMJpRDPY45UMoeHT4lAoD3AarK9QZQkUmI2nAffH2qruOhRhgx5OLSFMIQNmHrQUlUt1iry79eELc= X-Received: by 2002:a17:907:6e8e:b0:722:e15d:b89e with SMTP id sh14-20020a1709076e8e00b00722e15db89emr13620458ejc.12.1656082337277; Fri, 24 Jun 2022 07:52:17 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Li-Wen Hsu Date: Fri, 24 Jun 2022 22:52:05 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Merge of vendor/openzfs/zfs-2.1-relesae to stable/13 forbidden To: Martin Matuska Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656082338; 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=f6Eg588moExQ4U1IJfJFPAswBCLE4a+3Bc2xtc8366M=; b=XryUpROSLFyZR+KRk3B0En+Ep0MfgD1lX5iq8H8pg4Nco4MLCZ6FC5rCcTSOwWtCPXr3ma +Cb2z5D9Z45f19VWABUso5d3+B7bwsOlHWerXywbMw5Nt+vHfZoaaQmePWmD46cnOJti8K uAAEzXT2BknerfKQ4RQtaDkiyK9n7wt3X3cyYZEolmFuBsRXWCfWOM1qlFrgY3epvaxjV8 FmKNvfEF79rMpdRB5w2Plt4+yTxRLtH4K7WLieZaE45UEnOnkTOBzYWnllF9zWP6lxExZI YD8/1bBfo6zlnmfXudhQCUwaoieDO+LwlkyEIdWSMC9XbITb8agRoqH77tHrzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656082338; a=rsa-sha256; cv=none; b=LHKgkXqareC3xXtORz6VfPoBWt6y6ZL/9KlfYvus6dMcw0RWt/KMddLj2v/GbKdCvlZqMT tbkBdJMfuWBLTzpmMK3fk4fd02DPPANz9a5Oswk9zjGOoOnyCcUmCqs20OZCMPFYkKHBTY xKMzEnoncCs9MRHNMzT+H0OJrtB45WdxWSyC82wsJhoa5oEN5QQbAl1firP19/El3KjV1l /yX+94m0Q61gZv8680z3HHIotc2P3CdtMvCNGFPOxBBnyIkOZmeEvrRZqWEf8U/xEGC3MK n6+Jh3py+pM5A5IpNxb5uF+87LhQQbBdjZWd4SZUMXWmNVtdMX2o4FjPZs1u6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Fri, Jun 24, 2022 at 7:17 AM Martin Matuska wrote: > > Hello, > > there has been probably some change in configuration as I am not allowed > to merge vendor/openzfs/zfs-2.1-release to stable/13 anymore. > Please could anyone responsible take a look at this? > > remote: ================================================================ > remote: Currently only allow merge from vendor/* to main > remote: ================================================================ > remote: FATAL: VREF/MERGE-CHECK/src: helper program exit status 256 > remote: error: hook declined to update refs/heads/stable/13 > To ssh://gitrepo.FreeBSD.org/src.git > ! [remote rejected] stable/13 -> stable/13 (hook declined) > error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/src.git' > > Thanks > mm Hi, I'm sorry that the error message may not be enough, but this MERGE-CHECK hook has not been updated since we allow merging from refs/heads/vendor/openzfs/zfs-2.1-release to refs/heads/stable/13 I tried to search for the possible issue from the gitolite log but did not see the root cause. Can you help: - List the commands you used to merge from vendor/openzfs/zfs-2.1-release to stable/13 - `git show ` like https://cgit.freebsd.org/src/commit/?id=1f1e2261e341e6ca6862f82261066ef1705f0a7a for main? If possible: - Push your stable/13 tree to somewhere (e.g., a freebsd/freebsd-src fork on github or any other place works for you) for me to look into? Thanks, Li-Wen From nobody Fri Jun 24 20:14:35 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5E10686CA4D for ; Fri, 24 Jun 2022 20:14:45 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from www541.your-server.de (www541.your-server.de [213.133.107.7]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4LV7dJ22Xcz4j9L; Fri, 24 Jun 2022 20:14:44 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from sslproxy03.your-server.de ([88.198.220.132]) by www541.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1o4phM-000NMF-Cy; Fri, 24 Jun 2022 22:14:36 +0200 Received: from [188.167.171.2] (helo=[10.0.9.122]) by sslproxy03.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o4phM-000Viv-77; Fri, 24 Jun 2022 22:14:36 +0200 Message-ID: Date: Fri, 24 Jun 2022 22:14:35 +0200 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: Merge of vendor/openzfs/zfs-2.1-relesae to stable/13 forbidden Content-Language: en-US To: Li-Wen Hsu Cc: freebsd-git References: From: Martin Matuska In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: martin@matuska.de X-Virus-Scanned: Clear (ClamAV 0.103.6/26583/Fri Jun 24 19:50:16 2022) X-Rspamd-Queue-Id: 4LV7dJ22Xcz4j9L X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 213.133.107.7 is neither permitted nor denied by domain of mm@FreeBSD.org) smtp.mailfrom=mm@FreeBSD.org X-Spamd-Result: default: False [-0.88 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[mm]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_SPF_SOFTFAIL(0.00)[~all:c]; NEURAL_SPAM_MEDIUM(1.00)[1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.78)[-0.776]; RCPT_COUNT_TWO(0.00)[2]; MLMMJ_DEST(0.00)[freebsd-git]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE]; RCVD_TLS_ALL(0.00)[]; HAS_X_AS(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Hi Li-Wen, I use the same command as always: git subtree merge -P sys/contrib/openzfs vendor/openzfs/zfs-2.1-release The local vendor/openzfs/zfs-2.1-release has always the state of refs/heads/vendor/openzfs/zfs-2.1-release 2 additional files are modified during the merge: zfs_config.h and zfs_gitrev.h Here is the merged branch: https://github.com/mmatuska/freebsd-src/tree/stable/13_zfs_2.1.5 On 24. 6. 2022 16:52, Li-Wen Hsu wrote: > On Fri, Jun 24, 2022 at 7:17 AM Martin Matuska wrote: >> Hello, >> >> there has been probably some change in configuration as I am not allowed >> to merge vendor/openzfs/zfs-2.1-release to stable/13 anymore. >> Please could anyone responsible take a look at this? >> >> remote: ================================================================ >> remote: Currently only allow merge from vendor/* to main >> remote: ================================================================ >> remote: FATAL: VREF/MERGE-CHECK/src: helper program exit status 256 >> remote: error: hook declined to update refs/heads/stable/13 >> To ssh://gitrepo.FreeBSD.org/src.git >> ! [remote rejected] stable/13 -> stable/13 (hook declined) >> error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/src.git' >> >> Thanks >> mm > Hi, > > I'm sorry that the error message may not be enough, but this > MERGE-CHECK hook has not been updated since we allow merging from > refs/heads/vendor/openzfs/zfs-2.1-release to refs/heads/stable/13 > > I tried to search for the possible issue from the gitolite log but did > not see the root cause. Can you help: > > - List the commands you used to merge from > vendor/openzfs/zfs-2.1-release to stable/13 > - `git show ` like > https://cgit.freebsd.org/src/commit/?id=1f1e2261e341e6ca6862f82261066ef1705f0a7a > for main? > > If possible: > > - Push your stable/13 tree to somewhere (e.g., a freebsd/freebsd-src > fork on github or any other place works for you) for me to look into? > > Thanks, > Li-Wen From nobody Fri Jun 24 20:52:42 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C3C1987171D for ; Fri, 24 Jun 2022 20:52:55 +0000 (UTC) (envelope-from lwhsu@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 4LV8TM51Z3z4mnR; Fri, 24 Jun 2022 20:52:55 +0000 (UTC) (envelope-from lwhsu@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656103975; 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=6NtfNdUOaYvSKst3m68TnFRmanL0UfyJr4dSzzPeofU=; b=Wc+v3tq0UzzfdruEf9kRXBqmnooZaCVZCjQIwd8Go5ybTIi9/OFVvo1yDmPsO6CxVfNQcI 0M9l7ukrYD18YQ7MBAzynTR8Xi26KY282SWIl9CZOlH+Og9dChQSVQNZr8XBe5VUDja6qd 6EZoET0z+LQ6V3cu7nUeZELNyuzAtt1VTmak7iNAF7Sr4B7Ns2VQ2aiW8N9Ogm7Ry1f+VM iFM9B2bEg/9UjsqdFMChPImqBsl8inoXtqEpG9+IzlKORrlF/f0dKIkkaPh3bt9inloum+ XMjX0WDCQDXV20XaHwe1TzdoB8MNiRWq4jckcRfalC7IlLYBkU2GIy24IAXToA== Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 855AAE4EE; Fri, 24 Jun 2022 20:52:55 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-ed1-f49.google.com with SMTP id e2so5089705edv.3; Fri, 24 Jun 2022 13:52:55 -0700 (PDT) X-Gm-Message-State: AJIora8Y1uUTEaRn+xcFoOklgKyIH8H66k17QktjWkjSSA6Q69JUZtq7 dl0gFGRNBHyeNHg+rchG4dNVmzgNDijaSRLiYl0= X-Google-Smtp-Source: AGRyM1vKX1Z9voIctB/HZC0ByJdgLZgx/KU+NUkEwQGgnBGPUNDlrPYfmMYn6Vu6G8sVj2lPzz8MhHOKg8H9rZw8Cp0= X-Received: by 2002:a05:6402:f0e:b0:435:8b5d:ece9 with SMTP id i14-20020a0564020f0e00b004358b5dece9mr1243290eda.276.1656103974068; Fri, 24 Jun 2022 13:52:54 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Li-Wen Hsu Date: Sat, 25 Jun 2022 04:52:42 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Merge of vendor/openzfs/zfs-2.1-relesae to stable/13 forbidden To: Martin Matuska Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656103975; 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=6NtfNdUOaYvSKst3m68TnFRmanL0UfyJr4dSzzPeofU=; b=X+bcjLfecyyfmU5pS/ZQpRq0VuHzrwpfqZsMygZcMgtMlZ1jQYUcaednyy7LaksA85nV9B dRnaRkmH2+YUqi2t+h99pGaSJlvqPeBOmJzWD50bMyCs9V0box9JnWAukBC1WueTze9I9K HqrHYm+YMnw7i+N5SnH5noEHOmygrkB64S4c/TQUwUGwApsuJRIaCANd8OLrGWKB+75x7S cxyrY9pIYrQJd/IvID77E6nr2Z78qBT9N4im+7DdcCN2VHjHXpLpDSnkAn0/0yxMETi5vY QIREmnvUD5X0S9HjFBAM8c1NFPI3O8ZkfVLYmLgdUrwvxpCDIo18A4WZM5iNMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656103975; a=rsa-sha256; cv=none; b=rENTPQmnmQwXzC/AN+Y2wGcyVSzYs6KkuUCkovC1cbqGjkJT014Tvo4ggj9eRIBE7vc36e rvtBVCdwDr8teVaqblhV04MK8yhAGXNMs3NviAlDFMBQg8UNTXRyTT3tc3hP1eeLG8JiMn hoBdaRncuaVS8Fuk3JMPH4Ex8AZl0/bh2NLiqQ02KVegIhw3dGagwsnvWDTmvzphZcP5E6 oRlp0okGOeSMLNaM2bGJ9ADNuIfNKjshy2Y3nEkihD0WnWPVTfimekIwjPid5f7f5r1xHa r3kTJKJILmm3OydJLiSqYTHDLtLKBpuVMryR9lP7bYrBC1iqHELtgOlJgOMh8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Thanks, it is ineed a bug of the MERGE-CHECK hook, the weird part is I don't know why it didn't affect the first time we're using it. Please try again. Best, Li-Wen On Sat, Jun 25, 2022 at 4:14 AM Martin Matuska wrote: > > Hi Li-Wen, > > I use the same command as always: > > git subtree merge -P sys/contrib/openzfs vendor/openzfs/zfs-2.1-release > > The local vendor/openzfs/zfs-2.1-release has always the state of > refs/heads/vendor/openzfs/zfs-2.1-release > 2 additional files are modified during the merge: zfs_config.h and > zfs_gitrev.h > > Here is the merged branch: > https://github.com/mmatuska/freebsd-src/tree/stable/13_zfs_2.1.5 > > On 24. 6. 2022 16:52, Li-Wen Hsu wrote: > > On Fri, Jun 24, 2022 at 7:17 AM Martin Matuska wrote: > >> Hello, > >> > >> there has been probably some change in configuration as I am not allowed > >> to merge vendor/openzfs/zfs-2.1-release to stable/13 anymore. > >> Please could anyone responsible take a look at this? > >> > >> remote: ================================================================ > >> remote: Currently only allow merge from vendor/* to main > >> remote: ================================================================ > >> remote: FATAL: VREF/MERGE-CHECK/src: helper program exit status 256 > >> remote: error: hook declined to update refs/heads/stable/13 > >> To ssh://gitrepo.FreeBSD.org/src.git > >> ! [remote rejected] stable/13 -> stable/13 (hook declined) > >> error: failed to push some refs to 'ssh://gitrepo.FreeBSD.org/src.git' > >> > >> Thanks > >> mm > > Hi, > > > > I'm sorry that the error message may not be enough, but this > > MERGE-CHECK hook has not been updated since we allow merging from > > refs/heads/vendor/openzfs/zfs-2.1-release to refs/heads/stable/13 > > > > I tried to search for the possible issue from the gitolite log but did > > not see the root cause. Can you help: > > > > - List the commands you used to merge from > > vendor/openzfs/zfs-2.1-release to stable/13 > > - `git show ` like > > https://cgit.freebsd.org/src/commit/?id=1f1e2261e341e6ca6862f82261066ef1705f0a7a > > for main? > > > > If possible: > > > > - Push your stable/13 tree to somewhere (e.g., a freebsd/freebsd-src > > fork on github or any other place works for you) for me to look into? > > > > Thanks, > > Li-Wen From nobody Fri Jul 29 11:41:53 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LvQbW1cNhz4XsBK for ; Fri, 29 Jul 2022 11:41:59 +0000 (UTC) (envelope-from mat@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 4LvQbW0p08z40Rc; Fri, 29 Jul 2022 11:41:59 +0000 (UTC) (envelope-from mat@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659094919; 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=KANnmLxnOOfV+RwYE4XepIc2qHXUZ2N6jOe8DU6koP0=; b=GYV9igdpB3Cu26qJC8f/N5PjFobET3x8O96Mz8jSA7avAeJxCVyo94aYbE+JyCw5f1HvD+ ugkb7hsxtW/XutNDK+ukwJdEr+66IX/Fj+12zMnO/igFxJBHakvbs8hjJ1Vi/b6qsz7Ju+ 3xRlxktjBAzjxIWseX1fftcIB4bSXktN44dLhB+eb87cpPFS4N0ZDZrLYtm3kdpBcs7OnV /rD9+DiqHKOLEW6Mnu3UdTPBtiATQFb21hb98YB1EyMzGPbuEXoEZQ/9eQtaUQwn38cpqp TSzmd6I2Pi9a3hRz5c2A65UETyE8s/dciFmUKG7qBMypbf/1J5k+wuJCwrdvNA== Received: from mail.j.mat.cc (owncloud.cube.mat.cc [IPv6:2a01:678:4:1::228]) (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 "mail.mat.cc", Issuer "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4LvQbV6LkkzlRL; Fri, 29 Jul 2022 11:41:58 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:50:716:1ded:630c:7c39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 7DDDE942D81; Fri, 29 Jul 2022 11:41:55 +0000 (UTC) Date: Fri, 29 Jul 2022 13:41:53 +0200 From: Mathieu Arnold To: freebsd-git Subject: Git new feature when cloning Message-ID: <20220729114153.cl2p3kpap5qcspz2@aching.in.mat.cc> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="r3xczjpazl24yfyb" Content-Disposition: inline ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659094919; 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=KANnmLxnOOfV+RwYE4XepIc2qHXUZ2N6jOe8DU6koP0=; b=PVAYuR6ILPa8A9lScc4sJf0O9DOS/KOvvor1I7NbZTh162SO00Co56zAv/bkJh5HseK11P PFgxJp3ep9RBATpyRbbyBDMWhVLuMcfBWxFcPkbesZX43Nq2PBJyoVW5p5Bxuk7IJKGENm sPRjl/jW6WJLQ4xWa2m4KaZ4c6vFLQ6CKxMfUh5BmOLVEIJuFqHxVEjT0+W26wGT037cLK yzN88VfYA82fU8kzUN3/RNXb+eDdu3ovD83ka462GW84S/Sb7DNPTfcQ2XVwmfwvJ/qJ6K h4VXNO0lKFDnGr50EF/Bi2c1kKPRNqBGBHIc5JXpUMENEnj1jMEpUaqnI3mQFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659094919; a=rsa-sha256; cv=none; b=lKryGK872j4hbJ/xJmfwLuA0fwsc1m+2icJCRibHm5D4zK5323KnJpZsQJajmhBKsJyClP 60WLhrryuAQ9OSZqPUz6vUYAAef3Y9pqgnVddw6QjCmRGfSeoC67nUTR92WFEqtyBU6kkp LeF4PFLhmPEDbh4WbFgwUFga66Gt39KAptcXdHIvrbRflW0I5RxT/GHBJqwIb5mkzAmLoG BPvrRbTP1uSgYPjGDXjnL0WE1cR8l2PisP4p6wLK7rXQwJbBC5V3f1WQDcrP+4fKrwYlsq tNZ/vUf+SGhRzu+0LaR2SPcjSbe6t/u8xaBWOFDJVgjatCkSQkAHhW53V6JpxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --r3xczjpazl24yfyb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, A while back, Git grew a way to filter the objects it asks the server when cloning. It can speed up the download because it will download less data. It also stores less information locally, so this is a bonus. The only drawback is that whem you ask for information it does not have locally, it will have to download the missing data, which it'll store locally, so you don't download something twice. (it's done under the hood and you don't see it happening, the only thing you'll see is the command being a bit longer to return.) It all happens in the --filter argument to git clone, see git-rev-list(1) for the whole explanation, and range things you can do. It can filter a few things, but in order of information downloaded, the most common values I can see for our usage are: --filter=3Dblob:none This will download all the commits and all the trees (which are the file list of a directory), and only the blobs needed to checkout the branch you asked for. --filter=3Dtree:0 This will download all the commits, and only the trees and blobs needed to checkout the branch you asked for. Both of those can be used with --sparse, which enables sparse checkout, which basically only checks out the files in the root directory, and you need to use git sparse-checkout to add/remove files to the checkout. That can be useful if you don't have a lot of disk space, and need multiple checkouts to work on. Note that you can't really use --sparse on the ports tree if you want to build things out of it, because you would need to add all the dependencies, and the framework, to build a port. For a kernel developper though, you can probably live with only having the kernel sources and not the whole world. And for numbers because we all love numbers : | filter | SRC | PORTS | DOC | |------------------|-------|-------|------| | blob:none | 605M | 576M | 119M | | blob:none sparse | 314M | 498M | 37M | | tree:0 | 407M | 238M | 97M | | tree:0 sparse | 115M | 115M | 15M | | filtering | 1461M | 1010M | 321M | This is the size of .git/objects, for a checkout done this morning. So it is basically the amount of data downloaded from the server. Note that contrary to using --depth=3DX, which limits the number of commits you get from the server, and which renders the repository ok for testing, but not great for development because fo some limitations, the repository you get when running --filter is fully usable, the only drawback is that if you need bits of history you filtered out, they will be downloaded on the fly so internet access may be required. PS: as filtering is done on the server, a knob needed to be enabled on our servers, gitlab and github already supported the feature. gitrepo.f.o and gitrepo-dev.f.o have it enabled, I am unsure about the mirror status, but they should be ok too. --=20 Mathieu Arnold --r3xczjpazl24yfyb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEFD4jMKwz5Ud8Ywu3ecmT/A9inX0FAmLjx4FfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0 M0UyMzMwQUMzM0U1NDc3QzYzMEJCNzc5Qzk5M0ZDMEY2MjlEN0QACgkQecmT/A9i nX17Hwf/QdAt2kGzh6oLUlHC2Klm+VVKaZeypTQkyDmro3pr0Z5972mEfXsAqkqZ ZfvV09QiEKfhI6X08pjEsY25PDcdEnC5bNu41DkR9WLC5IpnIg5M1SD5NdaIr7d5 2FN90VN6UTeuJwKMnDh3PFYqx3JA+HYcf63dfF4uGG3wK1Oro2cD3x/CQEFD8hF6 LX0cnjgprpl1t+/gXr+SFILEKzlmTJMELki8UV88T67M/EBM4bcARAzekPtYPw/n kDDEGB4x+qaDH1J9/u9nALllQGj14NTdhUCz1EhTNKbNDQKDJfoEmzb7Oo34+3sV HPoqlkO/oNLls+OY0krxdqSDG45tkA== =E6mj -----END PGP SIGNATURE----- --r3xczjpazl24yfyb-- From nobody Fri Jul 29 11:46:55 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LvQjR3Srrz4XtnD for ; Fri, 29 Jul 2022 11:47:07 +0000 (UTC) (envelope-from lwhsu@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 4LvQjR2wwXz416m; Fri, 29 Jul 2022 11:47:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659095227; 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=2yY5Wc14HXM2t3BUQ48k/wpdH9DuYo+nY4pRxhAML9Y=; b=qP52SgSeaK3kwuPsjppYNDno37vmax8/mIzLUL6rkoiXGmucr4Qk7ecQ6vDAugh15Ja1LS NRE6WfS9B4I8OJuox3U8d9yYydnDnEM4gtaOBFnxOSnaloDQlydcHOJA62yGTeU9Yx13zq hJVJHLLisYqKnerKxoVVlW5Z8pQdsTmGTTmFMIRVgl3fGcf4MfL+lq1Uj77raWG42jcUVA /tWF3lXn0UM/TVm0ZDh52t+70iwpFiT/LsFa1uX7HmQvjnZLIIMO+7+LTYoBvWanm84Hxb nBuawC2NW4Z4NWKjf24X7jjg6Vfysga9zcu3aAOYZusP4ZPnjp5mOy7fiNtH4w== Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (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 1D4" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4LvQjR1t98zlRV; Fri, 29 Jul 2022 11:47:07 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-ej1-f54.google.com with SMTP id oy13so8091318ejb.1; Fri, 29 Jul 2022 04:47:07 -0700 (PDT) X-Gm-Message-State: AJIora8imgPffzLBiOYmtai2PeAFmWU2i7JsAdFYpU0srqi/6FCKeZcM PIl3pzahysVrbvTmBoC3ONIXhJ7nX48p6Ay972w= X-Google-Smtp-Source: AGRyM1t55xUelXLU3uVlexP6gBlOCIoE+4SgdL8enX85eVuRxgLjAMt/VCf0vMcL4E2Q9tF/quMWM789vS3yy+CxtJw= X-Received: by 2002:a17:907:1c24:b0:72b:838f:cada with SMTP id nc36-20020a1709071c2400b0072b838fcadamr2558647ejc.125.1659095226254; Fri, 29 Jul 2022 04:47:06 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <20220729114153.cl2p3kpap5qcspz2@aching.in.mat.cc> In-Reply-To: <20220729114153.cl2p3kpap5qcspz2@aching.in.mat.cc> From: Li-Wen Hsu Date: Fri, 29 Jul 2022 19:46:55 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Git new feature when cloning To: Mathieu Arnold Cc: freebsd-git Content-Type: multipart/alternative; boundary="0000000000009c113705e4f035d3" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659095227; 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=2yY5Wc14HXM2t3BUQ48k/wpdH9DuYo+nY4pRxhAML9Y=; b=jZfr1WT+mKkiGo6jwSkYasdm+V0xp+XHTZm9j/vI31uF+XNLhc9xZAHAtJ/FOC62cv3eoN F2RDSaEYOAROjCcTs9fLKMIkPWaiBab2BIE/uUOb7vPADjZf61kuG9gnVIRAoxLOiXheYe a8zOzEyoybs3hcwpoVZPpvYJ0UpIvl/QB+9YCt7L5EC1MFH0Nrd2Zyefw8wZdGxu8+6XUa lgW1xJoFMcl+CO9CYeS+kjCodvWmPOqQe8dGVBxL49LnPqCXFFeF5GoyFYh6ET/uYti1ok uz2Wvy3jCQZozSECQH1YvAWdmwOBLcZfej5goZT1R8EW85YWhQ8gESyUI0mY8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659095227; a=rsa-sha256; cv=none; b=YhGAGM4ePb614oeyZrWDpP1oIOITdR2V17FypvR+rbh3lcKv86oWuuqVV6V+7ovVxbua8d jUZyy6QQgeepqZW13ZKoo1VDWWUIDtS5JXTB0AAYP9ScYdnK8cZ9Lxs9FhSm8XX3kDRjk3 ZbxhhiqW9woeqwJokjj4TgkgIL6CZ5tr2STVqRxWLHMx1xWGow+aTG26nj0OFbrsWEv/HZ BuUo2I/fzt/cVMi86pKnZI0p0VovfoQ4f1cHLqBdclkgynblIyR2igEtMLg2rEzxPMgcg5 MCwAiaECZUgjMG3pow3v9pLLm9Tff5OdSNVAliioOFqN7XY8/7HxTmCpc6UU4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --0000000000009c113705e4f035d3 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Jul 29, 2022 at 19:42 Mathieu Arnold wrote: > Hi, > > A while back, Git grew a way to filter the objects it asks the server Thanks for the tip! Do you have a plan to integrate this excellent tutorial to docs.FreeBSD.org? PS: as filtering is done on the server, a knob needed to be enabled on > our servers, gitlab and github already supported the feature. > gitrepo.f.o and gitrepo-dev.f.o have it enabled, I am unsure about > the mirror status, but they should be ok too. Sorry this is not done yet, there are some more issues in the real life happened and I=E2=80=99ll work on this ASAP, should be no later than next w= eekend. Best, Li-Wen > --0000000000009c113705e4f035d3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Fri, Jul 29, 2022 at 19:42 Mathieu Arnold <mat@freebsd.org> wrote:
Hi,

A while back, Git grew a way to filter the objects it asks the server

Thanks for the tip! Do= you have a plan to integrate this excellent tutorial to docs.FreeBSD.org?

PS: = as filtering is done on the server, a knob needed to be enabled on
=C2=A0 =C2=A0 our servers, gitlab and github already supported the feature.=
=C2=A0 =C2=A0 gitrepo.f.o and gitrepo-dev.f.o have it enabled, I am unsure = about
=C2=A0 =C2=A0 the mirror status, but they should be ok too.

Sorry this is not done yet, ther= e are some more issues in the real life happened and I=E2=80=99ll work on t= his ASAP, should be no later than next weekend.

=
Best,
Li-Wen
--0000000000009c113705e4f035d3-- From nobody Fri Jul 29 11:52:21 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LvQqX4MPvz4XvR3 for ; Fri, 29 Jul 2022 11:52:24 +0000 (UTC) (envelope-from mat@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 4LvQqX3t4Bz41bN; Fri, 29 Jul 2022 11:52:24 +0000 (UTC) (envelope-from mat@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659095544; 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=rKK2Kdc6OFo9bdObqPcAxddHJNrjdkVmUj3O6yAPhZY=; b=hG0PMGm8dTYMoHj3rkqMaIPHNRGIOqjKG23sD4li5AcTran31mT3qDogfMwvhYEKjNESzb RSypsM3PlI35Ha67xcZL4u3SchdRTCtZvgkMmdmhfy5ZkBCQKr2FZS724n6/ftNYozwpPG Q90uPYwy5m71W9GS08SyJ/ALhWyeZ3COnvsLLzOl0XwEZ/wJ/cxhisknYVgzhCg4HIq0C9 I/N3pUqFfUV3zgANYUuQgE30w9nE3jnFMz43+dWJpdmNL3WDNTiWY0c1CqM25ksH28vAGa yxPtG/bN2j+kb5JsJwM88LRSuX9LNBqqHax24uQeT2Vl81JB/PHbOqLxcB7BEA== Received: from mail.j.mat.cc (owncloud.cube.mat.cc [IPv6:2a01:678:4:1::228]) (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 "mail.mat.cc", Issuer "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4LvQqX2K5szlL7; Fri, 29 Jul 2022 11:52:24 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:50:716:1ded:630c:7c39]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 24232942D81; Fri, 29 Jul 2022 11:52:23 +0000 (UTC) Date: Fri, 29 Jul 2022 13:52:21 +0200 From: Mathieu Arnold To: Li-Wen Hsu Cc: freebsd-git Subject: Re: Git new feature when cloning Message-ID: <20220729115221.v6vapjqaocbrbjgx@aching.in.mat.cc> References: <20220729114153.cl2p3kpap5qcspz2@aching.in.mat.cc> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="u666w5nctggypepq" Content-Disposition: inline In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659095544; 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=rKK2Kdc6OFo9bdObqPcAxddHJNrjdkVmUj3O6yAPhZY=; b=IQQl7gT+1usiXvBSZMT49AatgoHHEKCRduYn4CJ2UEiJuTl+A7UuMj0JJC0w7y2JfS7oYT BMVtLTdjGoRIXYfpsmxX7a4+tt+fdeM+eXj4vk7nytYzmhCHShOlXXk1WDwbdV9tbm46ee bGWkoBt6cZDAFr2faSNH0SyCsxEKQa51E43auMpWleZD2NNA2OUN50a0OqN83N6pft7VuW EjJjNS4i5h73MnTZHYyXmWP0MD/ZVR7H+A5zolCOgPM4ngWRZZN71pBKXzuwPTUF5yCXJQ XqBnmKOktrJkOQWBHC9M+EjlD1vAyhP/v2RJYgvu6bU/31d1EzKHwXTbK88KWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659095544; a=rsa-sha256; cv=none; b=yMWhXe+3qGx2JauhU/LRm6xLT7jdwIKTgORlBRKsX0cShBbdUQhYFzrCve60iiR11vm7pN BW6equzLZpJr1hhVURwDmbnQ1zLQXEPiyPKhK6KUKtSb9sQh9PU8oODPoM+MzTAP6q0Zs6 415PCF3njLjtf4v5IdidcMSEvIRSYLvW5iZKVJ7vRdhcoUX1y4D1jGsRYg1t7Dcxp5C9ho iE82zTOzMOsPVJuobOzL8niCoRU7abLqKN8EyF1Da2f8IOEhFFEo/f2YI7kPEWL081K+QF X+tccVc5AIqO3oMeHH74b6BXlgB58URCbNuq9yB8nPrG2+P7VWcwoTDYOQKdJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --u666w5nctggypepq Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 29, 2022 at 07:46:55PM +0800, Li-Wen Hsu wrote: > On Fri, Jul 29, 2022 at 19:42 Mathieu Arnold wrote: >=20 > > Hi, > > > > A while back, Git grew a way to filter the objects it asks the server >=20 >=20 > Thanks for the tip! Do you have a plan to integrate this excellent tutori= al > to docs.FreeBSD.org? I was not planning to, but I could add something to the Git Primer. > PS: as filtering is done on the server, a knob needed to be enabled on > > our servers, gitlab and github already supported the feature. > > gitrepo.f.o and gitrepo-dev.f.o have it enabled, I am unsure about > > the mirror status, but they should be ok too. >=20 >=20 > Sorry this is not done yet, there are some more issues in the real life > happened and I=E2=80=99ll work on this ASAP, should be no later than next= weekend. Great, thank you. --=20 Mathieu Arnold --u666w5nctggypepq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAABCgB9FiEEFD4jMKwz5Ud8Ywu3ecmT/A9inX0FAmLjyfVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE0 M0UyMzMwQUMzM0U1NDc3QzYzMEJCNzc5Qzk5M0ZDMEY2MjlEN0QACgkQecmT/A9i nX3NVggAi9/6CID61taO5shTwCmav72nytnFE3yuz10unBPZ1Osaoxq9nDq4WKnV c0JRtbmAxAquAtA55lX0DSYE18TjYTb7hmFpT21yTWnv9kd0onauLpPN9N86SyK3 mWYjrE2NwjVWtMR5YXKVtMpWOb6Nf5tbv0FZpPdb/0TW+R3vDwTB3dSqSXE4H+9z zWLAKBvFmD1h9jRfhfPQHZWPsyGGB7kMiy1ihnd3g9fy0Pu7Z4vExV2tz4IcdRS/ bES4SuWOcP6K60WLLNOXfrTSqxsDGGIlZ0uO7tG9ftqkS2hF8IeNkSf7MGOGfo/F Uy5lmP1BBV0ZmpjRyPRJmAcBpH3T1Q== =N+Ii -----END PGP SIGNATURE----- --u666w5nctggypepq-- From nobody Mon Aug 1 13:37:09 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LxK1G3S3lz4XnTW for ; Mon, 1 Aug 2022 13:37:22 +0000 (UTC) (envelope-from lwhsu@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 4LxK1G2Zt4z43c1; Mon, 1 Aug 2022 13:37:22 +0000 (UTC) (envelope-from lwhsu@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659361042; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G4WcmR9/XzueTeobjFC6g+o4F5oXra9Vgv/p5KDBq+o=; b=TrLiHZuA5jYgvNUETlZpWN4Z2CeJs0k0jkVHsBnSQusseF13vE69sKxfuuWSTD0G7PaQ3Z 0BxqDbdkMmnargXfQu+TMJtJT8cdTvkPYDXCtBI/3wrz2jagEVlOwWBytxoUGjNv7sY46g YpG4ztMsTYasdvRtJn8HYefEN14pYhbWb2D6JdEK+l7/ZXTXuHYQDNpVv6FPvGN2E7HMwJ xpeLJhK8X5D/KgfG8slMOjOa86sSEtNUX6tJUXJYP3OqVXEurtJzGon45qF5h4UVDyCGki EvAQWVWS5LPaSTcyHZH4ryMTO2v2qaZsnYbY1Ke5/39nOUuFgyVq6vIgvgzKRw== Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (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 1D4" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4LxK1G1VP2z10bS; Mon, 1 Aug 2022 13:37:22 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-ed1-f48.google.com with SMTP id e15so13754062edj.2; Mon, 01 Aug 2022 06:37:22 -0700 (PDT) X-Gm-Message-State: AJIora/L607fZRk4odBMilIsxrke1ap6WILS77i6NEV4o2i1FAsSnbiT XOk8Airaa1Vt70TS6XUxe03vaBwhnDK//C90r2A= X-Google-Smtp-Source: AGRyM1suUB2EmSWcNs8inyGiFUrx/Uw1/SqHQW7sA2EMXSHwRl9t8LV4kOI/6WH9kQTWH2Rf7OCTgWVPuvnrcYxddU8= X-Received: by 2002:a05:6402:5289:b0:43b:69a9:38c8 with SMTP id en9-20020a056402528900b0043b69a938c8mr16639710edb.263.1659361041189; Mon, 01 Aug 2022 06:37:21 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <20220729114153.cl2p3kpap5qcspz2@aching.in.mat.cc> <20220729115221.v6vapjqaocbrbjgx@aching.in.mat.cc> In-Reply-To: <20220729115221.v6vapjqaocbrbjgx@aching.in.mat.cc> From: Li-Wen Hsu Date: Mon, 1 Aug 2022 21:37:09 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Git new feature when cloning To: Mathieu Arnold Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659361042; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G4WcmR9/XzueTeobjFC6g+o4F5oXra9Vgv/p5KDBq+o=; b=YZxZ1G7UPZt2Io4y+njc6lDdorvbv8LvMaF18JbUePCATXRjSIo/gBkNvvh+bNEuqv2R2r T+GNVPU8V5itAy0fe6RJiW8XzJ2itS9AYbukgSCQKf/T54YEyVtZhbvBtP9sfT1KFtmgrV bTJCqUL6kA8CWjzXPRgY5/a8+h/dODM6nMmM2dAmB8QfHlPkwady0iuM4sLECM90Nugank /AUdPnpEisew5oIpKe/XprsBiNbRwIUHhTXjQvTYWyIdWKhb1dkVxCFMPDwK2Ug9EPHfRi GuqVNwHK61PzhiEyepWXZHeFASKzFtYUe1BB7EZsh30ogapieFu0EYwNM2TUhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659361042; a=rsa-sha256; cv=none; b=x7H6/lZTlLQvxWFghmdWQmdKP3qjaSr/uNh3xEB4PnmbQeqH+ZJP25CxFDx7yKhc+j4Pee ShdZlaK6W1n6s2cKurZdCDPiKm/lY7VvpJLwDWRBoC+mwCO9R80B4P8+b/ye2nD6et+SsA bnbNiTb7SUdhHsqrzsvNnS/f2A+pqV4CzozQdMwF/HihmjV6qt+F9fMPzcyYfxustKrifF uWE0GY4LTZUJEri0OnM0sajxjZM5kA8QImbHO4kNcIW6g8a2WIBfXfpEAV73taGmxyuksh vA525eNurV0VCBiZAOJERfvqRUZv7vkwMNYQ4ew1RL2MAqRKqxz+oLzYtYuzoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Fri, Jul 29, 2022 at 7:52 PM Mathieu Arnold wrote: > > On Fri, Jul 29, 2022 at 07:46:55PM +0800, Li-Wen Hsu wrote: > > On Fri, Jul 29, 2022 at 19:42 Mathieu Arnold wrote: > > > > > Hi, > > > > > > A while back, Git grew a way to filter the objects it asks the server > > > > > > Thanks for the tip! Do you have a plan to integrate this excellent tuto= rial > > to docs.FreeBSD.org? > > I was not planning to, but I could add something to the Git Primer. > > > PS: as filtering is done on the server, a knob needed to be enabled on > > > our servers, gitlab and github already supported the feature. > > > gitrepo.f.o and gitrepo-dev.f.o have it enabled, I am unsure abou= t > > > the mirror status, but they should be ok too. > > > > > > Sorry this is not done yet, there are some more issues in the real life > > happened and I=E2=80=99ll work on this ASAP, should be no later than ne= xt weekend. > > Great, thank you. This is enabled on gitrepo.freebsd.org and all public mirrors (git.freebsd.= org). BTW, it's recommended to clone/fetch/pull from git.freebsd.org and only use gitrepo.f.o for pushing. Best, Li-Wen From nobody Sat Aug 13 09:54:22 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4bVZ3g45z4YT9L for ; Sat, 13 Aug 2022 09:54:30 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4bVY6L0gz3TX2 for ; Sat, 13 Aug 2022 09:54:29 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.95 (FreeBSD)) (envelope-from ) id 1oMnqY-000BTN-Bn for freebsd-git@freebsd.org; Sat, 13 Aug 2022 11:54:22 +0200 Date: Sat, 13 Aug 2022 11:54:22 +0200 From: Kurt Jaeger To: freebsd-git@freebsd.org Subject: git wants to commit more files than expected ? Message-ID: List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Rspamd-Queue-Id: 4M4bVY6L0gz3TX2 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 2001:14f8:200:4::4 is neither permitted nor denied by domain of pi@freebsd.org) smtp.mailfrom=pi@freebsd.org X-Spamd-Result: default: False [-2.10 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:12502, ipnet:2001:14f8::/32, country:DE]; RCPT_COUNT_ONE(0.00)[1]; R_SPF_SOFTFAIL(0.00)[~all:c]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[pi]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DOM_EQ_FROM_DOM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N Hi! I'm trying to commit the fix from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265060 and run into trouble. I have a probably pristine git repo: $ git remote -v freebsd https://git.freebsd.org/ports.git (fetch) freebsd https://git.freebsd.org/ports.git (push) $ git status On branch main Your branch is up to date with 'freebsd/main'. Changes to be committed: (use "git restore --staged ..." to unstage) modified: archivers/py-borgbackup/Makefile new file: archivers/py-borgbackup/files/patch-setup.py But if I run a git commit, additional two files turn up: # Changes to be committed: # modified: archivers/py-borgbackup/Makefile # new file: archivers/py-borgbackup/files/patch-setup.py # modified: print/pdf-tools/Makefile # modified: print/pdf-tools/distinfo Why isn't git status not reporting the two pdf-tools files, but git commit is ? How do I get rid of the two pdf-tools changes ? I'm not aware that I ever changed those files! -- pi@FreeBSD.org +49 171 3101372 Now what ? From nobody Sat Aug 13 13:46:20 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4hf66ky3z4YZj1 for ; Sat, 13 Aug 2022 13:46:22 +0000 (UTC) (envelope-from ashish@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 4M4hf663lbz3wJB; Sat, 13 Aug 2022 13:46:22 +0000 (UTC) (envelope-from ashish@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660398382; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=krPNWMRl5Qk/UL4+bmj0ZMasdw4aMhwrmNG0Le3yUAA=; b=Y436S8YlmFyhQsKJGl9LI6jAdgG7FmptYs+5qNVDIHSr1yixh4Tttwa4F01a95ODxQKpje 7SRZrGKACtNVyFT++XWJQmo8kr+/ze5poeh/AMZBToD/e24UmonZy/sAB7SJP7DFnlOrfB u3Owt4jo5605lTQqZ3ZopmOrKW7LXC0wJXVg8vzKsaWJkmJpSQMEnW72r/XOGADNoeY585 jlZGwvkakDdbyxoBry7Xhaj76CevU+egjBOCcz5tKfsqMP18fdgPfGN8GFlpIo75cdu9hB EJ73jokyr/PR0bahKsvzitFOGNeRWnFdPwBjBrLRK93yeszKQ7v+9EZHAmTxBQ== Received: from email.lostca.se (anamika.lostca.se [IPv6:2a01:4f9:3b:505c::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: ashish/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4hf6218WzkgN; Sat, 13 Aug 2022 13:46:22 +0000 (UTC) (envelope-from ashish@FreeBSD.org) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 13 Aug 2022 19:16:20 +0530 From: Ashish SHUKLA To: Kurt Jaeger Cc: freebsd-git@freebsd.org Subject: Re: git wants to commit more files than expected ? In-Reply-To: References: User-Agent: Roundcube Webmail/1.4.13 Message-ID: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> X-Sender: ashish@FreeBSD.org Organization: The FreeBSD Project ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660398382; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=krPNWMRl5Qk/UL4+bmj0ZMasdw4aMhwrmNG0Le3yUAA=; b=V+wfNc9233KAsnWAsk/91Ilt/ecP+qfJ6W6NTG5qSRPPMaHTXhoU5HBAKDN9acHRmE0WBB efGX+tQ6HK7HDHgIB/xgiLlZFBz9ADAeKmv68De9wVR5i9k6R/5eXIXGaQh0PT2PNalHLK Bke0vMAhANSKhMSOpUVAwdKzrqikwbQ57zbQCbIGkE62uGuIKDEIZFT9FRvlxyDKpk1ENr VrczRcZlFTek13NmpOnHMSYeCupNJ4JRkdC+tg+FNWYh1u2OkxJYVDn0O7rCWqvIo0BsBF oqMrBjvz5YbrFbtgxSdkvnMR/DJPu/uWagj0U+z+CLvvprBAhiI82fori2rAqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660398382; a=rsa-sha256; cv=none; b=jDLWu5pK6hhzC3+Vbxfr7RgSq+FP6HY8ir7/s/Kq01u8X5B6o1n/c81zTnKZi+kNlp2LqW EuOnX88LM/mCqacU3xisI+wcsVq1a2rx53GeXQ20HfhlSsXPT2Q1wRRqqwJuqMj4kJUx8q Fowtqs2G+zUY+gFl/ZliRdgrkFvsiYAtBaFKe8BEohcPOy+/OB9mMp5qCnk5S57yqc/rc7 irT8Z3fMO2/1Pb0TLASagqtR/ron+SiYIlhQZS0ve+aI35lSjOP8yb8iSUfq1Lsakat++D SbtjMHlYiOtVEwcEA3USSOoSMZ9HPcL+sARZvkejnqoqsvC2vywiGCWkR66kQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 2022-08-13 15:24, Kurt Jaeger wrote: > Hi! > > I'm trying to commit the fix from > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265060 > > and run into trouble. I have a probably pristine git repo: > > $ git remote -v > freebsd https://git.freebsd.org/ports.git (fetch) > freebsd https://git.freebsd.org/ports.git (push) > > $ git status > On branch main > Your branch is up to date with 'freebsd/main'. > > Changes to be committed: > (use "git restore --staged ..." to unstage) > modified: archivers/py-borgbackup/Makefile > new file: archivers/py-borgbackup/files/patch-setup.py > > But if I run a git commit, additional two files turn up: > > # Changes to be committed: > # modified: archivers/py-borgbackup/Makefile > # new file: archivers/py-borgbackup/files/patch-setup.py > # modified: print/pdf-tools/Makefile > # modified: print/pdf-tools/distinfo > > Why isn't git status not reporting the two pdf-tools files, > but git commit is ? Could you share the 'git commit' command-line that you're using ? If I've to guess then you're probably including the '-a' switch of git commit. If yes, then please don't include it. Thanks! -- Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116 20B6 C746 CFA9 E74F A4B0 From nobody Sat Aug 13 15:27:44 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4kv61dB2z4Z4Kh for ; Sat, 13 Aug 2022 15:27:46 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4kv52qfJz47W7; Sat, 13 Aug 2022 15:27:45 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.95 (FreeBSD)) (envelope-from ) id 1oMt3A-000DT8-GU; Sat, 13 Aug 2022 17:27:44 +0200 Date: Sat, 13 Aug 2022 17:27:44 +0200 From: Kurt Jaeger To: Ashish SHUKLA Cc: freebsd-git@freebsd.org Subject: Re: git wants to commit more files than expected ? Message-ID: References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> X-Rspamd-Queue-Id: 4M4kv52qfJz47W7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 2001:14f8:200:4::4 is neither permitted nor denied by domain of pi@freebsd.org) smtp.mailfrom=pi@freebsd.org X-Spamd-Result: default: False [-2.10 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWO(0.00)[2]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:12502, ipnet:2001:14f8::/32, country:DE]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[pi]; ARC_NA(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N Hi! > > But if I run a git commit, additional two files turn up: > > > > # Changes to be committed: > > # modified: archivers/py-borgbackup/Makefile > > # new file: archivers/py-borgbackup/files/patch-setup.py > > # modified: print/pdf-tools/Makefile > > # modified: print/pdf-tools/distinfo > > > > Why isn't git status not reporting the two pdf-tools files, > > but git commit is ? > > Could you share the 'git commit' command-line that you're using ? It was this: git commit --amend --author='Jose G. Juanino ' archivers/py-borgbackup > If I've to guess then you're probably including the '-a' switch of git > commit. If yes, then please don't include it. I now tried this: git commit --author='Jose G. Juanino ' archivers/py-borgbackup and it worked! Thanks! -- pi@FreeBSD.org +49 171 3101372 Now what ? From nobody Sat Aug 13 15:43:03 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4lF04RHQz4Z83q for ; Sat, 13 Aug 2022 15:43:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vs1-xe33.google.com (mail-vs1-xe33.google.com [IPv6:2607:f8b0:4864:20::e33]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4lDz4XRBz3Fl9 for ; Sat, 13 Aug 2022 15:43:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vs1-xe33.google.com with SMTP id v128so3464507vsb.10 for ; Sat, 13 Aug 2022 08:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=3ZIob4aSTk3UPwCZTT6LyZksJ6x+J1kgCAkf4d6hW0g=; b=4sR0w+56oexRyD2i+4LH0NoW30bpsx8B5fKfGMaYGM8mtqMHMdhz0y+iCCuHhcD8AU 7pQtWKpZ+B3LVQK2jCNGvcTIaf9lHuV0T1LWSqW5QsX0JYBgX7JxkuhdcqCt3++PFmEG yu8mR5Sw5BSLPEdNsxB80W7UlkRlE2Mze76lG9jzuXT4goFXoFDrzJym4cHUDAMSGVTu jhnYv0m/ru6CuMnHh7K5JZ/M0VxuSaNZO6t8pNfM1hwGNZPxSbrJgVSgm9DP1Mqm1l/d +repBs5K2w99mMBioOX+TAGxTihidFgswrnmfc17fP/jjgw0k3eZuwXY7kuJA1q6f0T8 AL+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=3ZIob4aSTk3UPwCZTT6LyZksJ6x+J1kgCAkf4d6hW0g=; b=R1kW4R0nIiYLDxPyDev8hym0DfnYYTGli83kmJMJgiSquiEQa6gSC8t/2ICptPqspf GpP0ENg4iTW9b9jvNYI498H2LTmc60q0aWkxqYOMwXbajCCjn+qWMg/gp7VYzc0GouHV QTSWp/hDP6mfpVT8DELBKlt34ev0R7vnp9/wvenVjgejRjVuPWiMaLA6qJRZ88hFe4rG 1yVkhdpWrghMi3QM8S+jKE889ddgfx94fZ2eDUHIugSdlrLwx2XainbkivvJ1y5Y4o5g lRNf8voKCr0VSQYPgrhuM9D5314DNVlUyZeeXty6ED5C2RoEgfDeRlXcqALwI2z/8hVN R4pg== X-Gm-Message-State: ACgBeo3xbyN9UgoAGcovgbE6jkWJAHQsKIE2pURJ4amd3lhusuOn6AyO EzI7DvACkb+WNSxnEIKE6ct5uhqorvdTglfG7/8FyQ== X-Google-Smtp-Source: AA6agR7nsz0wELkBl0wJcJuuPA6swpRiE+XPWIElZNx1hzNrKJTSdzVsF5LI81b6nftsTZ1RExXBiOAdA7WygdEPIps= X-Received: by 2002:a67:b208:0:b0:357:e999:441c with SMTP id b8-20020a67b208000000b00357e999441cmr3430912vsf.67.1660405394379; Sat, 13 Aug 2022 08:43:14 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Sat, 13 Aug 2022 09:43:03 -0600 Message-ID: Subject: Re: git wants to commit more files than expected ? To: Kurt Jaeger Cc: Ashish SHUKLA , freebsd-git Content-Type: multipart/alternative; boundary="000000000000b7291f05e6214171" X-Rspamd-Queue-Id: 4M4lDz4XRBz3Fl9 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=4sR0w+56; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::e33) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.00 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-0.999]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::e33:from]; RCVD_TLS_LAST(0.00)[]; TO_DN_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; RCPT_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[bsdimp.com]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --000000000000b7291f05e6214171 Content-Type: text/plain; charset="UTF-8" On Sat, Aug 13, 2022 at 9:27 AM Kurt Jaeger wrote: > Hi! > > > > But if I run a git commit, additional two files turn up: > > > > > > # Changes to be committed: > > > # modified: archivers/py-borgbackup/Makefile > > > # new file: archivers/py-borgbackup/files/patch-setup.py > > > # modified: print/pdf-tools/Makefile > > > # modified: print/pdf-tools/distinfo > > > > > > Why isn't git status not reporting the two pdf-tools files, > > > but git commit is ? > > > > Could you share the 'git commit' command-line that you're using ? > > It was this: > > git commit --amend --author='Jose G. Juanino ' > archivers/py-borgbackup > Yes. this was adding borgbackup to the previously committed thing.... > > If I've to guess then you're probably including the '-a' switch of git > > commit. If yes, then please don't include it. > > I now tried this: > > git commit --author='Jose G. Juanino ' > archivers/py-borgbackup > > and it worked! Thanks! > This is creating a new commit with borgbackup... I'll have to check it out... I'm in need of a good, automated backup... Warner --000000000000b7291f05e6214171 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Aug 13, 2022 at 9:27 AM Kurt = Jaeger <pi@freebsd.org> wrote:<= br>
Hi!

> > But if I run a git commit, additional two files turn up:
> >
> > # Changes to be committed:
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0archivers/py-bo= rgbackup/Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0new file:=C2=A0 =C2=A0archivers/py-bo= rgbackup/files/patch-setup.py
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /distinfo
> >
> > Why isn't git status not reporting the two pdf-tools files, > > but git commit is ?
>
> Could you share the 'git commit' command-line that you're = using ?

It was this:

git commit --amend --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archive= rs/py-borgbackup

Yes. this was adding b= orgbackup to the previously committed thing....
=C2=A0
> If I've to guess then you're probably including the '-a= 9; switch of git
> commit. If yes, then please don't include it.

I now tried this:

git commit --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archivers/py-bo= rgbackup

and it worked! Thanks!

This is creating= a new commit with borgbackup...

I'll have to = check it out... I'm in need of a good, automated backup...
Warner=C2=A0
--000000000000b7291f05e6214171-- From nobody Sat Aug 13 15:45:29 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4lHp4m3bz4Z8Mq for ; Sat, 13 Aug 2022 15:45:42 +0000 (UTC) (envelope-from eduardo@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 4M4lHp4DVqz3Gj1 for ; Sat, 13 Aug 2022 15:45:42 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660405542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1W2sWmMR9gmIUMGGdPZyG1j6H0KED99mEVIPQxtWgCY=; b=qoci9Jj2ROo5GyWcfwMWn/56ZGLmj05Su0DNfpgdvkhh2Ils4iJ/kTn3GZug566852BhDg AU0HeZ6Km6KO5sYZxQQ6kp8BqMZHm8A9ZR3f6k/nfb9Tw/dI39DbyHWTWRmk2eoi61dp0I q3lOG6nAgLM81mQaheyXmAxZKpjb0j+76oEG3H0Mf4v96H2lvFEc0XzmXisFxWX154WW+C +JNpdRmtkQuJvssAhD/CaCX7RRii8P2NXwW1EjUs4qfX8Rw65R7Y3LdHvDtJUyCC6urLGn 1XGctqS1kms4l04Zi8eLaqQcSgCWF9q2rtede1OAbfafOQ+crvvGySZ0/4mPsQ== Received: from mail-vk1-f173.google.com (mail-vk1-f173.google.com [209.85.221.173]) (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 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4lHp31X8zlkm for ; Sat, 13 Aug 2022 15:45:42 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vk1-f173.google.com with SMTP id t64so1825287vkb.12 for ; Sat, 13 Aug 2022 08:45:42 -0700 (PDT) X-Gm-Message-State: ACgBeo1r0aibSIGVs/LnjePFcGDY1MBaasnUQOry3JwUSjnj8k6M1kHO Ltb0v4VS4NGZzH/AtBoL0zdzL8g2bCCQBSVIaKE= X-Google-Smtp-Source: AA6agR7Ps2B4Um50OiqIObrkYQH5v4Df/5Ii0jh/rGqcHMDTodgKD3zSkqRUwOwG55QBR1p5CVY8lKSZKR6fBXAJPcc= X-Received: by 2002:a1f:41c8:0:b0:377:1352:8f9d with SMTP id o191-20020a1f41c8000000b0037713528f9dmr3731954vka.25.1660405541724; Sat, 13 Aug 2022 08:45:41 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> In-Reply-To: From: Nuno Teixeira Date: Sat, 13 Aug 2022 16:45:29 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git wants to commit more files than expected ? To: freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000007f6cee05e6214a0c" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660405542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1W2sWmMR9gmIUMGGdPZyG1j6H0KED99mEVIPQxtWgCY=; b=XYa5+v/qEXTUEu+I61EMnAmgref8qlfb4h6dqtKD/qcy6dJWEaMwd7nNjpsf+NrZfhtLdW l2/IDe/TM6G+Sb4vRqEClwA8xnXp3iW3qM4goJCDjULBEtZbdK3cI9w52b0pGLlIAH+oUL kLmuN2gIhi3zJohLUC656m9zvmRbJu+Q4boH/rWV4cKfDU/CdDhz/O5XEJdAKxAXo65exw HH/vybWCFMI8w9YjfClqFkCHgR49IZ1Sn5OkqsN2DIU6Fo9bfKvgUKgg5H+wbGR7iookGM dcXjnSvS34DUrC7piRLRIdjJ85yV1twUz5dF23Gb/r2XhXRMzMk7qM2jX5ODNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660405542; a=rsa-sha256; cv=none; b=v/ObPhJotmzxRvXvqvs+QEUnkCijO2htSw4eAEus/pV9e8qBCsHSaEQHVXtk0YiAJ+k5u3 zaowLSS16A/bLh8hoKCH7WHRaN5Y6lk+3I5CSNQ1hKtMZIU0K8XOV2nAJmO5aNEndw4Dr/ Kxx82P9VH+mW2ReA7bXv17f/tcAfIi6IGkFCISGhrTpPvFVt7wBDtsgRuCFHmJpLHTOvGW reac6Sl9T4o50zKgSLKiUtK52THI2c8MxdceHlAoVmCDf9aLYyx+iO7GT6OBxmCYDQWiKt q9FPO2Xs1UhT5LlBux6e3vJ/XHYgJLSnX43xyzqMSANva+Ht1qvHC7GKtGClrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --0000000000007f6cee05e6214a0c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, I always forgot to use `git commit --amend` when commit needed some correction/change. I usually do a `git reset --hard ^HEAD` and then commit from scratch :) Next commit I do I will use amend and see if I got similar problem like yours. Cheers, Kurt Jaeger escreveu no dia s=C3=A1bado, 13/08/2022 =C3=A0= (s) 16:27: > Hi! > > > > But if I run a git commit, additional two files turn up: > > > > > > # Changes to be committed: > > > # modified: archivers/py-borgbackup/Makefile > > > # new file: archivers/py-borgbackup/files/patch-setup.py > > > # modified: print/pdf-tools/Makefile > > > # modified: print/pdf-tools/distinfo > > > > > > Why isn't git status not reporting the two pdf-tools files, > > > but git commit is ? > > > > Could you share the 'git commit' command-line that you're using ? > > It was this: > > git commit --amend --author=3D'Jose G. Juanino ' > archivers/py-borgbackup > > > If I've to guess then you're probably including the '-a' switch of git > > commit. If yes, then please don't include it. > > I now tried this: > > git commit --author=3D'Jose G. Juanino ' > archivers/py-borgbackup > > and it worked! Thanks! > > -- > pi@FreeBSD.org +49 171 3101372 Now what ? > > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000007f6cee05e6214a0c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

I always forgot to use `= git commit --amend` when commit needed some correction/change. I usually do= a `git reset --hard ^HEAD` and then commit from scratch :)

<= /div>
Next commit I do I will use amend and see if I got similar proble= m like yours.

Cheers,

Kurt Jaeger <pi@freebsd.org> escreveu no dia s=C3=A1bado,= 13/08/2022 =C3=A0(s) 16:27:
Hi!

> > But if I run a git commit, additional two files turn up:
> >
> > # Changes to be committed:
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0archivers/py-bo= rgbackup/Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0new file:=C2=A0 =C2=A0archivers/py-bo= rgbackup/files/patch-setup.py
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /distinfo
> >
> > Why isn't git status not reporting the two pdf-tools files, > > but git commit is ?
>
> Could you share the 'git commit' command-line that you're = using ?

It was this:

git commit --amend --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archive= rs/py-borgbackup

> If I've to guess then you're probably including the '-a= 9; switch of git
> commit. If yes, then please don't include it.

I now tried this:

git commit --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archivers/py-bo= rgbackup

and it worked! Thanks!

--
pi@FreeBSD.org=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+49 171 3101372=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Now what ?



--
Nun= o Teixeira
FreeBSD Committer (ports)
--0000000000007f6cee05e6214a0c-- From nobody Sat Aug 13 15:54:36 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4lVJ6r6Xz4ZBfT for ; Sat, 13 Aug 2022 15:54:48 +0000 (UTC) (envelope-from eduardo@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 4M4lVJ6Lk2z3KGM; Sat, 13 Aug 2022 15:54:48 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406088; 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=7z/fRuItLOJ0OfaXlR6i49rjy686T0a+y/GgMAfeZr4=; b=aZxVQeyh1NBFFfI5NwsZlo2c+9oWpA+HQQzaMkSJEBey28FnxmbFqbnoSYi6RDfxO0wLM0 0l+9/TCayjzkOaPdYGh3c7KL5H6/16fYUcMFgcGRagFxdKnfRKciRK3g7CXQ+rgS/72muB 0uW8X4XtXN20va4MymmuizLMlDbHdc/qGvhswR6UTFSJbnUvtx5Ax8pwurDtie8XTq8MDk e/2YaVlPmN7GiaYg9JWEf0YrnFVcjkYn9FLHzBq48ozzEYv0XfO0f1ebtSpra23tuFHZ3l sXan1NY0kJKyRXr5JXUnanPcL2ti4P9emG1ihPQg6SYyo73E9KVwS3lhg0kdXg== Received: from mail-ua1-f49.google.com (mail-ua1-f49.google.com [209.85.222.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 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4lVJ58kJzmk7; Sat, 13 Aug 2022 15:54:48 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-ua1-f49.google.com with SMTP id cd25so1369484uab.8; Sat, 13 Aug 2022 08:54:48 -0700 (PDT) X-Gm-Message-State: ACgBeo3nR6xmMMKALX41xpQ4iFiH+hjQxcWMhXICHj+uhjy+Rn9bK33o HLZNPvaz+GXFnjUM4CtALm5bfmJTsXlwAC29GO8= X-Google-Smtp-Source: AA6agR4VUEoXS/rfezhV4HS2I3CjJztXojM+ynEoBceMeTvMH6cNkzOdN71FYfs1yxm6N3S9sqLnIdmH+Rrl3RlTgrI= X-Received: by 2002:a9f:358c:0:b0:387:9de3:6c8a with SMTP id t12-20020a9f358c000000b003879de36c8amr3678394uad.94.1660406088206; Sat, 13 Aug 2022 08:54:48 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> In-Reply-To: From: Nuno Teixeira Date: Sat, 13 Aug 2022 16:54:36 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git wants to commit more files than expected ? To: Warner Losh Cc: Kurt Jaeger , Ashish SHUKLA , freebsd-git Content-Type: multipart/alternative; boundary="00000000000012154105e6216bc3" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406088; 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=7z/fRuItLOJ0OfaXlR6i49rjy686T0a+y/GgMAfeZr4=; b=bJ/EJYQntPY3t2MtMO3dAvWl+UKvcBJ91b2T9CKLNgBd81vQhYQpAx67GG2LI+90xlCpvb E57sU8iru+f39tWNXiW6WiHr+X96boRxUbfTF5wgOzYg+y8i2F4NGd9gkCpNFYlS4m+Pul hoORdVuekfIF2tl78j6efkSNIMBzN/0KiyHy6K0AYR9vJCS/Rc52e1uEjOur3nQQ39rjfU Hl14zUu2LVe4pYp20QMgUtsiykhMDQjpc8tPEPG1WzLYfTroJFuRKHM94+DnJDfJ/xV0Bc 5Whq6mbmxvaVqj6BeudEcGXtWd4b5aj5jpdzDQDj9jbqc9mOyhYFk1Ry/Ri6QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660406088; a=rsa-sha256; cv=none; b=VVIOkB+tZ9nJOIyCFWpZ5oOWf8zabUCl3T7fEuGPvwg1nwrQ1DgQxMIbSXVvS9kKEnUFx6 HplAxleL9wt+U11CIHmXe7Bekt0pDmNIMNa9mcXvsGo+cGQWAeAasIJKyd8YpkztLqNLgG X46oiIJ7IdAOROk8MnQVsj812+h9SVVxiTI3Ece2NMxfpO8ggZNB49cAHmmidmJ26DgzeH HAllajf2F46hQIr9uTheBqu8rdhVckK5rOYKW3Ia/dQqdBowXIMbrPNfDWK5KyzRaVdfY+ SN8TE3ILazRdozmsFEoMFiisoMBuTL7YfT0T/q1wkX8XOEP9RdwPH4BLyGXl9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --00000000000012154105e6216bc3 Content-Type: text/plain; charset="UTF-8" Hi Warner, I'll have to check it out... I'm in need of a good, automated backup... > You can try sysutils/restic too and the recent project sysutils/kopia. I made some real tests with restic and it went ok. Soon I will have a borgbackup repo too. Cheers, -- Nuno Teixeira FreeBSD Committer (ports) --00000000000012154105e6216bc3 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Warner,

I'll have to check = it out... I'm in need of a good, automated backup...
<= /blockquote>

You can try sysutils/restic too and the rec= ent project sysutils/kopia.
I made some real tests with restic an= d it went ok.

Soon I will have a borg= backup repo too.

Cheers,

-= -
Nuno Teixeira
FreeBSD Committer (ports)
--00000000000012154105e6216bc3-- From nobody Sat Aug 13 15:54:37 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4lVL0rlRz4ZBWG for ; Sat, 13 Aug 2022 15:54:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa33.google.com (mail-vk1-xa33.google.com [IPv6:2607:f8b0:4864:20::a33]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M4lVK1LkJz3KSB for ; Sat, 13 Aug 2022 15:54:49 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa33.google.com with SMTP id bq26so1838369vkb.8 for ; Sat, 13 Aug 2022 08:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=dDHPsAtziDCAqQYuwgx2XXTZh1c5mlWVr6gQu8rcUrY=; b=LHhIqZbypR6DAUct2I+yHpsW4pqPwwf6Ik6Bpooi145Fs8elDUritFDB3c65A5ZAJ/ 0/3wnnMEEzOyqFNcwuca5P054YBFvvFGxEsNoeX+6ij65N7U31e0sT8NhXc7ORuHRu1c /k0Q0zZ9q3gXe8N1wrZPtfBr6uw8M7ScCMWkdB73fDWXYn+ap5n5W/2Ymw7TFmrDGKDE Lq1fsKbQW1nts62Lp9yw6BGJHlUmT+lQTGQfp9jB64st64dPgHAuRDzTl795CecD2g0u gT7xsPeH3VPRkn/NcMno7iTzq8eJbOiUPr/Vel8pCmO7FofttYyCioc0VSJCjQIUYTe+ cGLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=dDHPsAtziDCAqQYuwgx2XXTZh1c5mlWVr6gQu8rcUrY=; b=8Neh+JRu0qwlSffyz5CauMIj9WSgY4EmUWrrMxL/xqm0gVDgUsTgmbvuqpO3uV/Yy+ vXka8N2mRTE5kblHPxk6Obnr2uKLQiuBMePtYNjty6uT6Ow6Wa5UqxUT9FHeXuQYntqw D4vSCfiSppuhfrN0DBNpipg9lb49dzUciQq2eDEvWbYdo9GrBoMApy5NV6sfSphbvW58 SFyLEFDPIadckfAZvfIrFRM9fvBdeY3zKatJ7t7ZlkawbHG1dK7gy+qKSdFHktbmHRbM qZRmED5FpHbQXdsKuUjPkSBe6cDIelTxY0hBPS8kXcgzmsAo3ChCKkl0wle3peUa7Gje DtEQ== X-Gm-Message-State: ACgBeo1aKtFRCWzxO9KI0EPxIixbcvE57jtKCQ7OAh8tUlrUjQCUuq/Y 1zQZ7If5rG2OLjlDDkS/5Wmc2KcnwOfFS9Z98NDzVw== X-Google-Smtp-Source: AA6agR7k20SSzhy31l4nGysykWGQuS2fcbD3kuiqLD6HmbtUNz6ZA+dDhM5/fD/bdRTVvTkTx6YlwD/jVK4RPyk25WE= X-Received: by 2002:a1f:dac3:0:b0:377:8cb:4544 with SMTP id r186-20020a1fdac3000000b0037708cb4544mr3797930vkg.7.1660406088456; Sat, 13 Aug 2022 08:54:48 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Sat, 13 Aug 2022 09:54:37 -0600 Message-ID: Subject: Re: git wants to commit more files than expected ? To: Nuno Teixeira Cc: freebsd-git Content-Type: multipart/alternative; boundary="00000000000015f38105e6216b92" X-Rspamd-Queue-Id: 4M4lVK1LkJz3KSB X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=LHhIqZby; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::a33) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.00 / 15.00]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-0.999]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; R_SPF_NA(0.00)[no SPF record]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::a33:from]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; TO_DN_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --00000000000015f38105e6216b92 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sat, Aug 13, 2022 at 9:45 AM Nuno Teixeira wrote: > Hi, > > I always forgot to use `git commit --amend` when commit needed some > correction/change. I usually do a `git reset --hard ^HEAD` and then commi= t > from scratch :) > > Next commit I do I will use amend and see if I got similar problem like > yours. > git rebase -i freebsd/main main is what I do when I'm working on main and need to 'curate' the commits. Warner > Cheers, > > Kurt Jaeger escreveu no dia s=C3=A1bado, 13/08/2022 =C3= =A0(s) > 16:27: > >> Hi! >> >> > > But if I run a git commit, additional two files turn up: >> > > >> > > # Changes to be committed: >> > > # modified: archivers/py-borgbackup/Makefile >> > > # new file: archivers/py-borgbackup/files/patch-setup.py >> > > # modified: print/pdf-tools/Makefile >> > > # modified: print/pdf-tools/distinfo >> > > >> > > Why isn't git status not reporting the two pdf-tools files, >> > > but git commit is ? >> > >> > Could you share the 'git commit' command-line that you're using ? >> >> It was this: >> >> git commit --amend --author=3D'Jose G. Juanino ' >> archivers/py-borgbackup >> >> > If I've to guess then you're probably including the '-a' switch of git >> > commit. If yes, then please don't include it. >> >> I now tried this: >> >> git commit --author=3D'Jose G. Juanino ' >> archivers/py-borgbackup >> >> and it worked! Thanks! >> >> -- >> pi@FreeBSD.org +49 171 3101372 Now what ? >> >> > > -- > Nuno Teixeira > FreeBSD Committer (ports) > --00000000000015f38105e6216b92 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Aug 13, 2022 at 9:45 AM Nuno = Teixeira <eduardo@freebsd.org= > wrote:
Hi,

I always forgot to use `git = commit --amend` when commit needed some correction/change. I usually do a `= git reset --hard ^HEAD` and then commit from scratch :)

Next commit I do I will use amend and see if I got similar problem li= ke yours.

git rebase -i fre= ebsd/main main

is what I do when I'm working o= n main and need to 'curate' the commits.

W= arner
=C2=A0
Cheers,

Kurt Jaeger <pi@freebsd.org> escr= eveu no dia s=C3=A1bado, 13/08/2022 =C3=A0(s) 16:27:
Hi!

> > But if I run a git commit, additional two files turn up:
> >
> > # Changes to be committed:
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0archivers/py-bo= rgbackup/Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0new file:=C2=A0 =C2=A0archivers/py-bo= rgbackup/files/patch-setup.py
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /distinfo
> >
> > Why isn't git status not reporting the two pdf-tools files, > > but git commit is ?
>
> Could you share the 'git commit' command-line that you're = using ?

It was this:

git commit --amend --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archive= rs/py-borgbackup

> If I've to guess then you're probably including the '-a= 9; switch of git
> commit. If yes, then please don't include it.

I now tried this:

git commit --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archivers/py-bo= rgbackup

and it worked! Thanks!

--
pi@FreeBSD.org=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+49 171 3101372=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Now what ?



--
Nuno Teixeira
FreeBSD Co= mmitter (ports)
--00000000000015f38105e6216b92-- From nobody Sat Aug 13 15:55:49 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4lWj5XS8z4ZBqV for ; Sat, 13 Aug 2022 15:56:01 +0000 (UTC) (envelope-from eduardo@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 4M4lWj50Mkz3KFN for ; Sat, 13 Aug 2022 15:56:01 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=w21h+gUCy38dnDE3bA1rw1QUhB/S3kXP1vDrxukkva8=; b=fUH7GiWf/JWnU7F5BuEwTpver0Cx3XcjJWFP4g9YwEVucQ8lOBQD7rBIvVbz4HxgM/lgEW ytGHJvBk1lwrhNezSVCigN+6dVvG7DRF+SvGxoS7sgxZKa14BEtzIoUror3y92LbrRjQL6 JILzIErXPKxO5Z4eNamCmlsy0yemmqjZ2IpGoL7QOkdxVcEMpjqc1XSSxpsQhlNk6247IX Ne2C8AjMmG+hrAKue7j6zrf4CPUuL6Bmu4iOQMjoeahKcnHPnE8zYP36NVqxBFs5SqwXv5 IgzsoBL4r0hhc7FWvPGiwXos+p68ENXTkM58rXbEuw4Q6o5ryKvIxc2MJyA1Fw== Received: from mail-vk1-f175.google.com (mail-vk1-f175.google.com [209.85.221.175]) (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 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4lWj42xwzmXF for ; Sat, 13 Aug 2022 15:56:01 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vk1-f175.google.com with SMTP id t64so1833183vkb.12 for ; Sat, 13 Aug 2022 08:56:01 -0700 (PDT) X-Gm-Message-State: ACgBeo2ZbryiIy9VhwefR3byqG/zpMSPP51mXIUxPNsbpvlzcigLBys4 EnbEHWsFtcssz19Hci5eTe83WJNkPoyyUwNZZRY= X-Google-Smtp-Source: AA6agR7ivHpqb9Th088H1xE/s4cP3zFznvP+5yoMMJJ7jHGGTA35+vhSh3CLbXPw+EMG7uhYQsNK8BDUBH6SXZKrDpI= X-Received: by 2002:a1f:188a:0:b0:377:226b:7cd6 with SMTP id 132-20020a1f188a000000b00377226b7cd6mr3709502vky.24.1660406161189; Sat, 13 Aug 2022 08:56:01 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> In-Reply-To: From: Nuno Teixeira Date: Sat, 13 Aug 2022 16:55:49 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git wants to commit more files than expected ? To: freebsd-git Content-Type: multipart/alternative; boundary="0000000000006bb1a405e6216f51" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=w21h+gUCy38dnDE3bA1rw1QUhB/S3kXP1vDrxukkva8=; b=k2b/NFUbcCjVbOtgSrf3drBElcL0wtMDs3rS78UvbNEcxtqiuDEhUvONFHyIstCFasePxy CeKiBdpyE957XZ9O0hKmJEKZMovChplu/P5KyoYv+703ZxunWwrUf+E52wKZ10MPsSjYeU lQ5p1rKcaCGRUXmex5AM8tCnIv6tPLtXAJQVf8psD1R0TD16Fz8V4OLj0tX/+badklmRlN kbTtdQJqbnmNJW5ft6pGtui/xF83h/WMRDMyoYxQCZDsMzHVx2JAtIfsYk3i18XrjOtqGd G/F3dRlGrfVqkLyW9QhD0tJHu9vnAlTLnPNChNZ755I4oYLlByFXGulufexUiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660406161; a=rsa-sha256; cv=none; b=l/o98kQwvBy3bTWd2GJQXDoEn3drvE7WYpMxs1SChsdIET9xPsUYrN/iyK6Ouifb/afsv7 sX7d5tKNHtbQBUexDObwy/35USX7Or8+C03z8YVabXBwZwviz7wa38bdvSr3r34BiM0HTk nfUPH+B4GiGVKP9652TvP0SQhQX974Mp4g+FX2R6rFjUx3JAbHCB24VxgghetTJAzo0c+o OErjJcyumhSWM3npkzjUiQW53V1dCxtpljuU/NjOwk/FISQVMpKewB5CGgjpvwCGWJfdiJ HD3V8MtGkKOv4rEwc16w1Rp8rQpf1g/C9H/axHmvzPZE8YdpVq0FE4xhjfjL6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --0000000000006bb1a405e6216f51 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable *** `git reset --hard HEAD^` Nuno Teixeira escreveu no dia s=C3=A1bado, 13/08/2022= =C3=A0(s) 16:45: > Hi, > > I always forgot to use `git commit --amend` when commit needed some > correction/change. I usually do a `git reset --hard ^HEAD` and then commi= t > from scratch :) > > Next commit I do I will use amend and see if I got similar problem like > yours. > > Cheers, > > Kurt Jaeger escreveu no dia s=C3=A1bado, 13/08/2022 =C3= =A0(s) > 16:27: > >> Hi! >> >> > > But if I run a git commit, additional two files turn up: >> > > >> > > # Changes to be committed: >> > > # modified: archivers/py-borgbackup/Makefile >> > > # new file: archivers/py-borgbackup/files/patch-setup.py >> > > # modified: print/pdf-tools/Makefile >> > > # modified: print/pdf-tools/distinfo >> > > >> > > Why isn't git status not reporting the two pdf-tools files, >> > > but git commit is ? >> > >> > Could you share the 'git commit' command-line that you're using ? >> >> It was this: >> >> git commit --amend --author=3D'Jose G. Juanino ' >> archivers/py-borgbackup >> >> > If I've to guess then you're probably including the '-a' switch of git >> > commit. If yes, then please don't include it. >> >> I now tried this: >> >> git commit --author=3D'Jose G. Juanino ' >> archivers/py-borgbackup >> >> and it worked! Thanks! >> >> -- >> pi@FreeBSD.org +49 171 3101372 Now what ? >> >> > > -- > Nuno Teixeira > FreeBSD Committer (ports) > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000006bb1a405e6216f51 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
*** `git reset --hard HEAD^`

Nuno Teixeira <eduardo@freebsd.org> escreveu no dia s=C3= =A1bado, 13/08/2022 =C3=A0(s) 16:45:
Hi,

I a= lways forgot to use `git commit --amend` when commit needed some correction= /change. I usually do a `git reset --hard ^HEAD` and then commit from scrat= ch :)

Next commit I do I will use amend and see if= I got similar problem like yours.

Cheers,

Kurt = Jaeger <pi@freebsd.o= rg> escreveu no dia s=C3=A1bado, 13/08/2022 =C3=A0(s) 16:27:
Hi!

> > But if I run a git commit, additional two files turn up:
> >
> > # Changes to be committed:
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0archivers/py-bo= rgbackup/Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0new file:=C2=A0 =C2=A0archivers/py-bo= rgbackup/files/patch-setup.py
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /Makefile
> > #=C2=A0 =C2=A0 =C2=A0 =C2=A0modified:=C2=A0 =C2=A0print/pdf-tools= /distinfo
> >
> > Why isn't git status not reporting the two pdf-tools files, > > but git commit is ?
>
> Could you share the 'git commit' command-line that you're = using ?

It was this:

git commit --amend --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archive= rs/py-borgbackup

> If I've to guess then you're probably including the '-a= 9; switch of git
> commit. If yes, then please don't include it.

I now tried this:

git commit --author=3D'Jose G. Juanino <jjuanino@gmail.com>' archivers/py-bo= rgbackup

and it worked! Thanks!

--
pi@FreeBSD.org=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0+49 171 3101372=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Now what ?



--
Nuno Teixeira
FreeBSD Co= mmitter (ports)


--
Nun= o Teixeira
FreeBSD Committer (ports)
--0000000000006bb1a405e6216f51-- From nobody Sat Aug 13 16:07:30 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4ln16trbz4ZFtX for ; Sat, 13 Aug 2022 16:07:33 +0000 (UTC) (envelope-from mandree@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 4M4ln16RKKz3LTM for ; Sat, 13 Aug 2022 16:07:33 +0000 (UTC) (envelope-from mandree@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mvcptQHHqe9CDlAvlXmt0Q97rv/TmvB9/uMOC+pPsqw=; b=a/LaYJ3q06QTOf76Kdc5HnbwA+dLPzeWw8zVdtPoQQrmc8XxB+DMGeTjjdeIGgHxtW9N9I ZY3sgHi4PWUMbk4e395ChfGEgc5sMo3ME5lq5bJB9RYp92lqSclJPk/fRxkrjpcZfLp1sP n+ox3sO8wLnqCN/FQwvItLSI02fHqKYV3+L307TnpijmWF51qZ6w2EFSYn5yzED+SWaqZR f6SN1eqBxglUd0DvnfQPIMakpJNZ6KD9bj6b4RBJSdkmyW7AfgoQbS3KNU0CbWI0ByN6Ev knVjTj6KFoHSAquV8t3clmwAUmrvDQtkJsr0/qCC1Xk7kmfuOgjoKQh5uPvonw== Received: from mandree.no-ip.org (p200300d02732db00de65dff1a874e1cc.dip0.t-ipconnect.de [IPv6:2003:d0:2732:db00:de65:dff1:a874:e1cc]) (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 did not present a certificate) (Authenticated sender: mandree/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4ln14bjDzmpb for ; Sat, 13 Aug 2022 16:07:33 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from [127.0.0.1] (localhost [127.0.0.1]) by ryzen.an3e.de (Postfix) with ESMTP id CF3ED814C7F for ; Sat, 13 Aug 2022 18:07:30 +0200 (CEST) Message-ID: <3c567ac9-d0b7-9ae3-a2bf-1ca3a28cf19a@FreeBSD.org> Date: Sat, 13 Aug 2022 18:07:30 +0200 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 From: Matthias Andree Subject: Re: git wants to commit more files than expected ? To: freebsd-git@freebsd.org References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mvcptQHHqe9CDlAvlXmt0Q97rv/TmvB9/uMOC+pPsqw=; b=R8YTLLVxxBIFvrhowsrBSI4Oc0ZF7PUSzoHYtAdI4vcRU5RRVkh5GpT5jFo3E5tp7RhepC Ks9ImlRs7O4z5NRJdnxxlFuTKY+QDVALiCpYL4qUbalFOp/0ndubZ1XTsy/ZLGYT1otWtZ Z51YQ8a0hgLpbCUOXDNi6S8QnfFYnsZhR5dJDVFo3J8qcAY7naFIhpvl4EuUWbn7Wr4Oj6 ARbyu6lqXeUs+oNH74xV2Tnv5YhRp/AWa/uoPgNMc4bnHwqLLFmMPpKQn3lCZ9MHyz4Vqv npOS7Y1YPeV6KW3Yv5qjOAlHpu9PYYQ9B/ST1KPtxTAHHMrXX41ZidTvB3z7sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660406853; a=rsa-sha256; cv=none; b=hD0ThGv4J2W4wwz0wGkDzM9+ah2T1yWwV+ItxKZFoGy5YD0qIhepzcSn6SJuT/GrBCD56/ l2FiqyQ7Ohxhi1mMQ3cYUTmcAMa3UX/9ckdCXPJ5UEgRc30Zq/UgG+xpFVCu38SQKSm5VK AR6om4/Vgo4usQprmWhl7+eCnf9rA9oyTElPv5knSy2uqUPAh5ydTgfw2JNZntA6E5XRAx b5ULfWiisof3VTyXYb5qOFjh+mQaGQqQ3LUXNx/LStq9RITBNs+gl1g28RYPUQxOVkS8aj Ur+eEW738US9+WRztB1SCulce7PnaG16Zei7eDbY6A+ePg9WJBzRynbpCOaYQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Am 13.08.22 um 17:54 schrieb Nuno Teixeira: > Hi Warner, > > I'll have to check it out... I'm in need of a good, automated backup... > > > You can try sysutils/restic too and the recent project sysutils/kopia. > I made some real tests with restic and it went ok. restic is a hog and pulls in hundreds of requisites spamming the distinfo. While I am still using restic myself, I am not convinced that anyone can curate 500 requisites properly. We have had node.js/npm accidents before. Borgbackup, by contrast, has a rather concise list of requisites. From nobody Sat Aug 13 16:07:46 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M4lnJ6cbzz4ZFtv for ; Sat, 13 Aug 2022 16:07:48 +0000 (UTC) (envelope-from mandree@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 4M4lnJ65VLz3Lfl for ; Sat, 13 Aug 2022 16:07:48 +0000 (UTC) (envelope-from mandree@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4avsdRjBJFi/3eAPIJJEyTnVNI9hwCRul7p6BrEYjrU=; b=KUpp2s/OhbOfuPOmWNwTzz3J/QM8+jGKbKUP/ms5moHzyPetoiiHjD+Ort1aLkjpkqZOEW DndVvjtnCilIsm0aDr7lRLgJjbbIeTcWqZyvC8c9sAmNiB66e9HWV6csZbj/PoI0YE7LsT T/qswyRIKhslTV1k1m8sJOM1M7wuQoYQLK0cWCitGp+JNP1Dudv9l2EN2d98Z8hY4ufeM5 p+UnObKUTJhpR8/uLHBthhXa5wiFlzSylf6SNFBmnosd1Utbe8fkFHcNG+XE2uFdBrraiM v2bqkOo0+yhKXDFRETpPpOumZy6ahMQJdVm3wakoxXTpQXIZZJmbTMheFDfhFQ== Received: from mandree.no-ip.org (p4fe52769.dip0.t-ipconnect.de [79.229.39.105]) (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 did not present a certificate) (Authenticated sender: mandree/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4M4lnJ4Mxrzmpc for ; Sat, 13 Aug 2022 16:07:48 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from [127.0.0.1] (localhost [127.0.0.1]) by ryzen.an3e.de (Postfix) with ESMTP id 2A4DE814C81 for ; Sat, 13 Aug 2022 18:07:47 +0200 (CEST) Message-ID: <231aa2e6-5a07-0227-e673-2c766dc0f5c8@FreeBSD.org> Date: Sat, 13 Aug 2022 18:07:46 +0200 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 From: Matthias Andree Subject: Re: git wants to commit more files than expected ? To: freebsd-git@freebsd.org References: <99af6a44013b44d7ec1196bc3809e3aa@FreeBSD.org> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660406868; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4avsdRjBJFi/3eAPIJJEyTnVNI9hwCRul7p6BrEYjrU=; b=cLbXuV5nV7bVclkSZC/XA5RXBIQ1bUhkN9UzWvu4ovBY9V7AGQB82ccE8nI9anqsxlMETy 4OeVAa6k1o//JtrSpA6Zw7orthxoT0GfK1r1uW8XOqZ3Xk0u0ImCW95J9vPGFVq351kHNI G05xzzJHW+xCXrNqvAzMZ4UgE7v9Oz/iiJHuN6dYtLwqjSAZWNLq4qZ5lhWCI0D6neDus1 Av3RwBhKPOY9E6HVGbqS5vuQ1mbGAANxNVxgumI+IVqDENdt5P5vu0CB+DniCtozdic523 uOmJCpnY0NEFfpAEIf3WLA6d/SZmdhYRattAYs3kslSRKhTwCPw+/GUEz4g0XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660406868; a=rsa-sha256; cv=none; b=Mx5bikR/BaXvrWhfEtOucVM2bw+L73WvLCVZ9pTQoqjBaIMqg/ghqv9/S876aRJguj+2Sv IYmV7hjxYvaQa8voX5mGIV4pndb7kDiA5f+i/w/gaaWRaYvgCJV23PL78fZ6PckGHQPjiJ J32IgaNE2Tw08pMdlrKkwffW2i5Wq0Mva8z28R8eebSmSkhvhMrtimAXNFWsyeQ8wCp7QM yiJu456JZ/91vf/gA9TsohBEC79m5qtrqSB+YLWJ5PhtMt9B2Qscqc27Ngu05zXcO6f7fl uABrFKqrQfU9goRwNzdAnXWRjixNoM86dbszIcLYWNHC4AWEJ0RwqyFEKq0BnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Am 13.08.22 um 17:45 schrieb Nuno Teixeira: > Hi, > > I always forgot to use `git commit --amend` when commit needed some > correction/change. I usually do a `git reset --hard ^HEAD` and then > commit from scratch :) > > Next commit I do I will use amend and see if I got similar problem > like yours. --amend means "tack what is currently marked for commit onto the previous commit, rewriting it and changing its hash". From nobody Fri Dec 2 08:04:05 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NNlnz4Jfjz4jgcS for ; Fri, 2 Dec 2022 08:04:07 +0000 (UTC) (envelope-from grahamperrin@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 4NNlnz2RfFz3vrm for ; Fri, 2 Dec 2022 08:04:07 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669968247; 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=NCZfFBgagccSk2rQc28Lm8F6yhQ7b6WXlApk2rKU+Bc=; b=V2hnTwzsO+zG0Bg1TTtF8iZAw5EwBJfGb+dt+RGIic7EShi0Z3pj4PPrNGf36nTTaVz/b9 olVO83uFUxfEySy5KnfJkJT/SKisvXm9rFM5lgD3VvdgRvotqKyv+5xrfaTmIr0iutRTi3 /5NHXgEy9Ht8n+Tie4SUwQgdpyHeVFKxI4rIud+vtThom+MO9xnS+Oi6Ss16FO8piefxxq 5KVFSLu1+vcpFsRX/E3qkHDG1nbmQn/pYpJam7aXocv2Q5wiIpZtGa6un5L9R8g62QZxzR LapyLuIfAS+qiv2+ItM51NQuEKFikhI9jXV2R8ejxHFGDLqPfTnutVRnYco04g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669968247; 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=NCZfFBgagccSk2rQc28Lm8F6yhQ7b6WXlApk2rKU+Bc=; b=XrTz6lUIz4k+cWzaGO6ASLhTm/MFr4TAXeZ5N9hu5nvt4iQruP6iHLxuWnCYxBL8pA/nFL QtXGWLv3c14NJYGvQ5t3DFJrj8Wlugbm9Pc9KdWJw8V9GkPAxn6qEPGhTKNcRQQ837/Tpk /2P8ti0o7y8wSy08cbZZTscMnonaTQOlLKNHC/4IRvBh9zSLHIKi0vij45EHjR2F6/WOQt Oifx40FPZ+XZTGblgPFJGrIFGI7yMA/XWgZLtpyMwqirHYjNrYrlHPbrnkHHPO+QcqpAMk kCQi43QEaRw7qJ0IktXKJ0iSZ0Q8cWs2V7l6XCSTCnDUEbPPdjHxolQUsHo2Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669968247; a=rsa-sha256; cv=none; b=c1OKS/EGPWRNjLkYFxEwqNJFY73wPjnrMh7GEeWUqLcNn25lusBpItWtMmI2RXalCOWn4N GfijyLpYTrSKvr/ZNo2t0MK48hn7W1KGjGkmGVb248cjlN4UzTS02v3qDDMibhd0T+02PD ZpZspw6YLFet8JzePbu+fTQ2MPTVybFRf5ebuXvPEkaeSD7avIOjTZ+ZoNLk8qgVfDMyq6 A0HwTKa3sBHz+AVAr2FpFYC+xwURnwKy5Uepdv3mEPQDtvF+eEiWzDPVtdYRpJLHCkkFvG hVLZdbFSHJPYG5U7adTFFxIXDIlBWoy3vUj1cQnofkGpnhPDiUemAa2ycrveYQ== Received: from [IPV6:2001:470:1f1c:a0::2] (tunnel642390-pt.tunnel.tserv1.lon2.ipv6.he.net [IPv6:2001:470:1f1c:a0::2]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: grahamperrin) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NNlny6lF5zWcx for ; Fri, 2 Dec 2022 08:04:06 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) Message-ID: Date: Fri, 2 Dec 2022 08:04:05 +0000 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 To: freebsd-git@freebsd.org Content-Language: en-GB From: Graham Perrin Subject: git-switch(1) then git-pull(1) Organization: FreeBSD Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------Q41vEk09c0jfIzHNhbvXwlFF" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Q41vEk09c0jfIzHNhbvXwlFF Content-Type: multipart/mixed; boundary="------------IyQDwhb0CFG4i1eUHANbPRB2"; protected-headers="v1" From: Graham Perrin To: freebsd-git@freebsd.org Message-ID: Subject: git-switch(1) then git-pull(1) --------------IyQDwhb0CFG4i1eUHANbPRB2 Content-Type: multipart/alternative; boundary="------------x3VUWjhvFZDByAzVn0oK8QYi" --------------x3VUWjhvFZDByAzVn0oK8QYi Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 SSdtIGNvbmZ1c2VkLg0KDQpJZiBhIHN3aXRjaCBpcyBpbnRlbmRlZCB0byB1cGRhdGUgdGhp bmdzLCB0aGVuIGhvdyBjYW4gYW4gaW1tZWRpYXRlbHkgDQpzdWJzZXF1ZW50IHB1bGwgbGVh ZCB0byB1cGRhdGVzPw0KDQoNCiUgZ2l0IC1DIC91c3IvcG9ydHMgc3dpdGNoIG1haW4gJiYg Z2l0IC1DIC91c3Ivc3JjIHN3aXRjaCBtYWluDQpBbHJlYWR5IG9uICdtYWluJw0KWW91ciBi cmFuY2ggaXMgdXAgdG8gZGF0ZSB3aXRoICdmcmVlYnNkL21haW4nLg0KTcKgwqDCoMKgwqDC oCBzeXMvbmV0Z3JhcGgvYmx1ZXRvb3RoL2hjaS9uZ19oY2lfY21kcy5jDQpNwqDCoMKgwqDC oMKgIHN5cy9uZXRncmFwaC9ibHVldG9vdGgvaGNpL25nX2hjaV9ldm50LmMNCk3CoMKgwqDC oMKgwqAgc3lzL25ldGdyYXBoL2JsdWV0b290aC9pbmNsdWRlL25nX2hjaS5oDQpBbHJlYWR5 IG9uICdtYWluJw0KWW91ciBicmFuY2ggaXMgdXAgdG8gZGF0ZSB3aXRoICdvcmlnaW4vbWFp bicuDQolIGdpdCAtQyAvdXNyL3BvcnRzIHB1bGwgLS1mZi1vbmx5ICYmIGdpdCAtQyAvdXNy L3NyYyBwdWxsIC0tZmYtb25seQ0KcmVtb3RlOiBFbnVtZXJhdGluZyBvYmplY3RzOiAzMjg0 LCBkb25lLg0KcmVtb3RlOiBDb3VudGluZyBvYmplY3RzOiAxMDAlICg4NDAvODQwKSwgZG9u ZS4NCnJlbW90ZTogQ29tcHJlc3Npbmcgb2JqZWN0czogMTAwJSAoMy8zKSwgZG9uZS4NCnJl bW90ZTogVG90YWwgMzI4NCAoZGVsdGEgODM3KSwgcmV1c2VkIDgzNyAoZGVsdGEgODM3KSwg cGFjay1yZXVzZWQgMjQ0NA0KUmVjZWl2aW5nIG9iamVjdHM6IDEwMCUgKDMyODQvMzI4NCks IDEuOTIgTWlCIHwgMS4xMSBNaUIvcywgZG9uZS4NClJlc29sdmluZyBkZWx0YXM6IDEwMCUg KDE5ODUvMTk4NSksIGNvbXBsZXRlZCB3aXRoIDQ3NCBsb2NhbCBvYmplY3RzLg0KIEZyb20g aHR0cHM6Ly9naXQuZnJlZWJzZC5vcmcvcG9ydHMNCiDCoMKgIGZiNmE5YWYzZTg5OC4uODBh ZmM2M2VlYjk5wqAgbWFpbsKgwqDCoMKgwqDCoCAtPiBmcmVlYnNkL21haW4NCiDCoMKgIDc0 OWNhM2VjMmU2MC4uYzM1NTJlZmUzOThlwqAgMjAyMlE0wqDCoMKgwqAgLT4gZnJlZWJzZC8y MDIyUTQNClVwZGF0aW5nIGZiNmE5YWYzZTg5OC4uODBhZmM2M2VlYjk5DQpeQw0KJSBjYXQg L3Vzci9wb3J0cy8uZ2l0L2NvbmZpZw0KW2NvcmVdDQogwqDCoMKgwqDCoMKgwqAgcmVwb3Np dG9yeWZvcm1hdHZlcnNpb24gPSAwDQogwqDCoMKgwqDCoMKgwqAgZmlsZW1vZGUgPSB0cnVl DQogwqDCoMKgwqDCoMKgwqAgYmFyZSA9IGZhbHNlDQogwqDCoMKgwqDCoMKgwqAgbG9nYWxs cmVmdXBkYXRlcyA9IHRydWUNCltyZW1vdGUgImZyZWVic2QiXQ0KIMKgwqDCoMKgwqDCoMKg IHVybCA9IGh0dHBzOi8vZ2l0LmZyZWVic2Qub3JnL3BvcnRzLmdpdA0KIMKgwqDCoMKgwqDC oMKgIGZldGNoID0gK3JlZnMvaGVhZHMvKjpyZWZzL3JlbW90ZXMvZnJlZWJzZC8qDQpbYnJh bmNoICJtYWluIl0NCiDCoMKgwqDCoMKgwqDCoCByZW1vdGUgPSBmcmVlYnNkDQogwqDCoMKg wqDCoMKgwqAgbWVyZ2UgPSByZWZzL2hlYWRzL21haW4NCiUNCg0KR2l0IC0gZ2l0LXN3aXRj aCBEb2N1bWVudGF0aW9uIDxodHRwczovL2dpdC1zY20uY29tL2RvY3MvZ2l0LXN3aXRjaD4N Cg0K --------------x3VUWjhvFZDByAzVn0oK8QYi Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

I'm confused.

If a switch is intended to update things, then how can an immediately subsequent pull lead to updates?


% git -C /usr/ports switch main &&= ; git -C /usr/src switch main
Already on 'main'
Your branch is up to date with 'freebsd/main'.
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/hci/= ng_hci_cmds.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/hci/= ng_hci_evnt.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/incl= ude/ng_hci.h
Already on 'main'
Your branch is up to date with 'origin/main'.
% git -C /usr/ports pull --ff-only && git -C /usr/src pull --ff-only
remote: Enumerating objects: 3284, done.
remote: Counting objects: 100% (840/840), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3284 (delta 837), reused 837 (delta 837), pack-reused 2444
Receiving objects: 100% (3284/3284), 1.92 MiB | 1.11 MiB/s, done.
Resolving deltas: 100% (1985/1985), completed with 474 local objects.
From https://git.freebsd.org/ports
=C2=A0=C2=A0 fb6a9af3e898..80afc63eeb99=C2=A0 main=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 -> freebsd/main
=C2=A0=C2=A0 749ca3ec2e60..c3552efe398e=C2=A0 2022Q4=C2=A0=C2=A0=C2= =A0=C2=A0 -> freebsd/2022Q4
Updating fb6a9af3e898..80afc63eeb99
^C
% cat /usr/ports/.git/config
[core]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 repositoryformatversio= n =3D 0
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 filemode =3D true
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bare =3D false
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 logallrefupdates =3D t= rue
[remote "freebsd"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 url =3D https://g= it.freebsd.org/ports.git
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fetch =3D +refs/heads/= *:refs/remotes/freebsd/*
[branch "main"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 remote =3D freebsd
= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 merge =3D refs/heads/m= ain
%

Git - git-switch Documentation

--------------x3VUWjhvFZDByAzVn0oK8QYi-- --------------IyQDwhb0CFG4i1eUHANbPRB2-- --------------Q41vEk09c0jfIzHNhbvXwlFF Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEWT/lssMHB+28ly8Kt2dIb0oY1AsFAmOJsXUFAwAAAAAACgkQt2dIb0oY1AuP 4BAAl46+mYoYydWyP3tIMQGHRMiiQjF5wmQLPaU5ux7tYB++c36soywS8esnng9QNTKjVmqxH24j ccl1NwTw1T5pWZ6mEUa5VcGisCmSZbcX1bq4q10ZMVX1BKHq/gLBd7vQolkdy8ZGYnri5J9kUwEW pQPU4gmSsEskmfRXpJdnjzrv33qsJbU8EQjMDXQPWNTcwaFh+7UkUNQWYxOfHJNG4whsC+dao2DA z5oS0cgwSKKAbfTAQ/T11eIOL7t7O5SY43XjQ+jIgNljBoKcMyERcPbJAyrG4WwrLZVU/jxnacz/ pL13WR3fbDgosAZXkfnh9nNQ35N872G/QiGK5hL5O1sVFz2elPmigD85epg1241ZzZL56dSizjzu ef/cJQIRHO78qujxZo8IDdfJJvXYGoL+P0mgA2Dx7G23cho/M5JQbR2R6rTjDmijY3Y9krrf50d8 Dm+wNNV6u62LpT1NYDEjGMM2ZD4VootQHbYyTaAjVXfU77vpkj9pqNg04+xeXv435l6jddTUiB0B 0AorPk2wlXgKoJl+G2N5BciAglFag+Iq3vxpP3mlFGE9b7It32cWS2nJ3B74Q3d/7pdkNhXTKVud yVYfInJwdnVevEauVXU4sNpWcFHzi+JNWutiYo5FsIsobPOM/WqxSEKP6aZxwp9mzzGPAIttdKZ+ WXY= =kwld -----END PGP SIGNATURE----- --------------Q41vEk09c0jfIzHNhbvXwlFF-- From nobody Fri Dec 2 12:08:56 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NNsDg6xNjz4jHLy for ; Fri, 2 Dec 2022 12:09:07 +0000 (UTC) (envelope-from eduardo@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 4NNsDg64d9z4NZd; Fri, 2 Dec 2022 12:09:07 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669982947; 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=HO6PI15fW0hEXdzRLcYMnWfphOZ34ihZjyWqTrpGg/w=; b=GUCCFPDFxbf3MbwiyeaS/LuIk+IgJb4I6lb0x8+WT5p66YxEE9T/gT+JZxEPXwun0VzgKJ PigRxpxtgk0x7HmkQeyEFEdqE+VskrhE33DvimJacb2fq7mQaq904f9uMAFuUamSN+Cefj OBRF9Z9bWHyoqc5Q+Pe1izVrKGv6mz2ZpH/j5FDmfk5WBnMbrOyOPuKbPoUsKhDtjrGFBD DRPz5d1MhS+msztMS1xEIYoHxDM/ZGmpYUwJSVZOi+ZAKXRruIZz80w0pjGEoWDp/OtCjZ wMn9p5djoRfpFErmE5lnADwyWMrz5PuHIGTGH9d9oMt94RsL9AtYcpIFk2LJCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669982947; 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=HO6PI15fW0hEXdzRLcYMnWfphOZ34ihZjyWqTrpGg/w=; b=gsUvPfvi6pjLUGL93j6SQ4PtpBUCTmVCjizPaaqOzU4ewbs35VNKVY6hyP0kjBEvBkhGEl XO3PbzOhQOv1qgBmzYnUotjE5ugRGKtQnX5c3eIwpkXeXP3CMZTnav+XfSk9ee18u9YcXb kTr97fmTVaGZfMJaDza2e6owmvaHf3BSMnSzd3GSOfQpUd4H/BK4Z2GxA82Fry7pyAGil4 +YBq5YozRbT9fwem2AByZ9+4Z63T+hD03tSPXYfmKV9pi/MSh8ZQmJWRpcfBiIHGGvJyfb 8StyVl8vDFpggHlFbZQ30kgmUrRG5l67oxbGRXB0L8kLPw0sci5lksT+z/n7vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669982947; a=rsa-sha256; cv=none; b=QB+mci4qXknagG8Jx5KR3UKyc4NhQNLaIQQxanpuXOeJ04P2HImFrtFx5yfPf7oxxYTtfd sLk8UoAdJ5ob8AOWDHny2J3sTT6AWid0vjI7rPP3yGxOMgnrflTal94dHs2D/tJbVhb8oi w17ADGNvIQO5F6ThaZZVcz9tcGQW14UOkqza0meh6rIlrE8590GqMZ4I5Is3GdiqHPmMtn 09o52mbZnxJPVuy2EhEjr2tNLoyXhs5v2BE8RdbQTqfe2Mcl6LqYobsWgjxeZ1Sm7fQAK/ vQpiykTYku8O55wmzBwzEC/DYIro7w3nzbrYtxJKDuYGTuFJ18l5xLANS3EiRw== Received: from mail-vs1-f52.google.com (mail-vs1-f52.google.com [209.85.217.52]) (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 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NNsDg57T0zbMy; Fri, 2 Dec 2022 12:09:07 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vs1-f52.google.com with SMTP id t10so4243883vsa.5; Fri, 02 Dec 2022 04:09:07 -0800 (PST) X-Gm-Message-State: ANoB5pl0Qzt6yh4WWoxoLbb995e800HdcyUpaWKtkKwJjmfuWS7GNJxu si/diy4WLB1ap/ZLE+AloryGMHmh94bS75cQiXc= X-Google-Smtp-Source: AA0mqf7WF5wURca55rKbFHLb5YKspwtlVuWcdb9wjlRoqlx0a4DhRhYropfqAHD+Dr73RZ30w0B1YjCXvNQNd8AKSG8= X-Received: by 2002:a67:ed94:0:b0:3aa:8846:b9a with SMTP id d20-20020a67ed94000000b003aa88460b9amr29225800vsp.58.1669982947333; Fri, 02 Dec 2022 04:09:07 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Nuno Teixeira Date: Fri, 2 Dec 2022 12:08:56 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git-switch(1) then git-pull(1) To: Graham Perrin Cc: freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000005b62e405eed73412" X-ThisMailContainsUnwantedMimeParts: N --0000000000005b62e405eed73412 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Not sure if I understand but I use `git switch` on ports tree to switch from 'main' to 'quarterly' to avoid having 2 trees. e.g. When in main and need to do a commit on 2022Q4: `git switch 2022Q4` `git pull --rebase` `git cherry-pick -x XXX` `git push` and switch back to main: `git switch -` or `git switch main` `git pull --rebase` Hope that helps Graham Perrin escreveu no dia sexta, 2/12/2022 =C3=A0(s) 08:04: > I'm confused. > > If a switch is intended to update things, then how can an immediately > subsequent pull lead to updates? > > > % git -C /usr/ports switch main && git -C /usr/src switch main > Already on 'main' > Your branch is up to date with 'freebsd/main'. > M sys/netgraph/bluetooth/hci/ng_hci_cmds.c > M sys/netgraph/bluetooth/hci/ng_hci_evnt.c > M sys/netgraph/bluetooth/include/ng_hci.h > Already on 'main' > Your branch is up to date with 'origin/main'. > % git -C /usr/ports pull --ff-only && git -C /usr/src pull --ff-only > remote: Enumerating objects: 3284, done. > remote: Counting objects: 100% (840/840), done. > remote: Compressing objects: 100% (3/3), done. > remote: Total 3284 (delta 837), reused 837 (delta 837), pack-reused 2444 > Receiving objects: 100% (3284/3284), 1.92 MiB | 1.11 MiB/s, done. > Resolving deltas: 100% (1985/1985), completed with 474 local objects. > From https://git.freebsd.org/ports > fb6a9af3e898..80afc63eeb99 main -> freebsd/main > 749ca3ec2e60..c3552efe398e 2022Q4 -> freebsd/2022Q4 > Updating fb6a9af3e898..80afc63eeb99 > ^C > % cat /usr/ports/.git/config > [core] > repositoryformatversion =3D 0 > filemode =3D true > bare =3D false > logallrefupdates =3D true > [remote "freebsd"] > url =3D https://git.freebsd.org/ports.git > fetch =3D +refs/heads/*:refs/remotes/freebsd/* > [branch "main"] > remote =3D freebsd > merge =3D refs/heads/main > % > > Git - git-switch Documentation > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000005b62e405eed73412 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Not sure if I understand but I use `git switch` on po= rts tree to switch from 'main' to 'quarterly' to avoid havi= ng 2 trees.

e.g.
When in main and need t= o do a commit on 2022Q4:
`git switch 2022Q4`
`git pull = --rebase`
`git cherry-pick -x XXX`
`git push`

and switch back to main:
`git switch -` or `git s= witch main`
`git pull --rebase`

Hope tha= t helps



Graham Perrin <grahamperrin@freebsd.org> escreveu= no dia sexta, 2/12/2022 =C3=A0(s) 08:04:
=20 =20 =20

I'm confused.

If a switch is intended to update things, then how can an immediately subsequent pull lead to updates?


% git -C /usr/ports switch main && git -C /usr/src switch main
Already on 'main'
Your branch is up to date with 'freebsd/main'.
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/hci/ng= _hci_cmds.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/hci/ng= _hci_evnt.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/bluetooth/includ= e/ng_hci.h
Already on 'main'
Your branch is up to date with 'origin/main'.
% git -C /usr/ports pull --ff-only && git -C /usr/src pull --ff-only
remote: Enumerating objects: 3284, done.
remote: Counting objects: 100% (840/840), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3284 (delta 837), reused 837 (delta 837), pack-reused 2444
Receiving objects: 100% (3284/3284), 1.92 MiB | 1.11 MiB/s, done.
Resolving deltas: 100% (1985/1985), completed with 474 local objects.
From ht= tps://git.freebsd.org/ports
=C2=A0=C2=A0 fb6a9af3e898..80afc63eeb99=C2=A0 main=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 -> freebsd/main
=C2=A0=C2=A0 749ca3ec2e60..c3552efe398e=C2=A0 2022Q4=C2=A0=C2=A0=C2= =A0=C2=A0 -> freebsd/2022Q4
Updating fb6a9af3e898..80afc63eeb99
^C
% cat /usr/ports/.git/config
[core]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 repositoryformatversion = =3D 0
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 filemode =3D true
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bare =3D false
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 logallrefupdates =3D tru= e
[remote "freebsd"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 url =3D https://git.freebsd.org/por= ts.git
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fetch =3D +refs/heads/*:= refs/remotes/freebsd/*
[branch "main"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 remote =3D freebsd
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 merge =3D refs/heads/mai= n
%

Gi= t - git-switch Documentation



--
Nun= o Teixeira
FreeBSD Committer (ports)
--0000000000005b62e405eed73412-- From nobody Sat Dec 3 01:19:44 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPBmz1TQkz4hxCn for ; Sat, 3 Dec 2022 01:19:47 +0000 (UTC) (envelope-from grahamperrin@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 4NPBmz0wcsz3JBW for ; Sat, 3 Dec 2022 01:19:47 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670030387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1F6IoEnhEad3TJCcO7mfgMWiqaKugUGn6KGlsEoWtZE=; b=H89tIH7Q/bX8tS9LziEQ3Z3zrgfFGx102X7ptUT1st/oRqVCWnh12q4Ece3km6/3ICKSey SmXtuEoMQdZYrsVQ+9SgzOm8QFqk754+iY+vbVlnQJ5jOCiX4SUe0+I4dYx08GWgmELZoT 5PmySnVZReDDelgQRkOJCiKNlq8wbwXUv7383K846298kl99JWcX9hf8VeMfpDe+XrfX5Y 5Jqlj1QJSl2uI3K37+VJXG8wtJP+m2diBtHJyaqhIVKKZNt7sHJqea0fgDeeU9b0ZIYA0t ytTIfxqOMvkVxsy7mS2honzFx6lV1FggZnlaCbAFtmSTcE8wIgFNVxCL72421w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670030387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1F6IoEnhEad3TJCcO7mfgMWiqaKugUGn6KGlsEoWtZE=; b=MZ7c2GQmWC9n0d5TjL3quzLvYkrDt8GmsaWReLtlONtSqEPM3Y0fj64fihQiOoGsGHICzC E4JULkt6mrFOnLU0veDBN07GWD3p+pEKsl7mxdBcYI+Nf68nxDqdiW6digcFfjIMLHFNUy G7VF+0jCyrG45+QHBaTX1gNjaQg1/m9LgNM9YJihatbTpSRyv7FZyTjcCXtIwlNKDkQljP h803n0e+FDbc064ii6A6n4VuA/4TiT80S8ppmFJ/dI5NUk4Cv5GpDtiPdyiTuE/9v8+n+m xnpBeh+wqKSGwPjsJh3KFWRsyBKEJO16m3+jlr7VnY+lZaPrn4D/EAhnUnvPdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670030387; a=rsa-sha256; cv=none; b=E1GPn2MWnPQ1DNRdbz/DrUU1h+PUuFvCWFMB3CzLabsbzFVThhpYfpkg47hLp42WU0x3gg vhR1qhN1WxDZ1uTEMb6aAQ+Rzr4Y1/RUqg57jrptjUaniyqrWwL6SNWnDAR6lvVYSfbwe7 z3MfYru0irl0bfdeB8cH5jCbpaNiE+c85rIhST3VcbjeQ0W3MhWVW9XE9Rpi4z+hG+EjuD jsNkJi5+TKkb8qDAMKjofHxSxUf0S69YfHWfuP3iR9W9xJOUKsp+Jfcb0qFtzLxKzYrGMN 3v4P8Awi72kUUqoyAc+u9I7a85dsBJxySe2Zq4WVR8xn8ELqczK3EyCT3lC5oA== Received: from [IPV6:2001:470:1f1c:a0::2] (tunnel642390-pt.tunnel.tserv1.lon2.ipv6.he.net [IPv6:2001:470:1f1c:a0::2]) (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 did not present a certificate) (Authenticated sender: grahamperrin) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NPBmy53YVzsp3 for ; Sat, 3 Dec 2022 01:19:46 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) Message-ID: Date: Sat, 3 Dec 2022 01:19:44 +0000 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: git-switch(1) then git-pull(1) References: Content-Language: en-GB To: freebsd-git@freebsd.org From: Graham Perrin Organization: FreeBSD In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------Zjz9GC25O3bSmHHzkRfCEJYM" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Zjz9GC25O3bSmHHzkRfCEJYM Content-Type: multipart/mixed; boundary="------------HQxejgomF7DXUpF0aLiKU3AD"; protected-headers="v1" From: Graham Perrin To: freebsd-git@freebsd.org Message-ID: Subject: Re: git-switch(1) then git-pull(1) References: In-Reply-To: --------------HQxejgomF7DXUpF0aLiKU3AD Content-Type: multipart/alternative; boundary="------------5eesFH8rVVfaiqXl0mpsGMIZ" --------------5eesFH8rVVfaiqXl0mpsGMIZ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gMDIvMTIvMjAyMiAxMjowOCwgTnVubyBUZWl4ZWlyYSB3cm90ZToNCj4gTm90IHN1cmUg aWYgSSB1bmRlcnN0YW5kIGJ1dCBJIHVzZSBgZ2l0IHN3aXRjaGAgb24gcG9ydHMgdHJlZSB0 byANCj4gc3dpdGNoIGZyb20gJ21haW4nIHRvICdxdWFydGVybHknIHRvIGF2b2lkIGhhdmlu ZyAyIHRyZWVzLg0KPg0KPiBlLmcuDQo+IFdoZW4gaW4gbWFpbiBhbmQgbmVlZCB0byBkbyBh IGNvbW1pdCBvbiAyMDIyUTQ6DQo+IGBnaXQgc3dpdGNoIDIwMjJRNGANCj4gYGdpdCBwdWxs IC0tcmViYXNlYA0KPiBgZ2l0IGNoZXJyeS1waWNrIC14IFhYWGANCj4gYGdpdCBwdXNoYA0K Pg0KPiBhbmQgc3dpdGNoIGJhY2sgdG8gbWFpbjoNCj4gYGdpdCBzd2l0Y2ggLWAgb3IgYGdp dCBzd2l0Y2ggbWFpbmANCj4gYGdpdCBwdWxsIC0tcmViYXNlYA0KPg0KPiBIb3BlIHRoYXQg aGVscHMNCg0KVGhlcmUncyB0aGUgc3RhdGVtZW50IGFmdGVyIHRoZSBzd2l0Y2g6DQoNCiJ1 cCB0byBkYXRlIg0KDQpJZiB0aGUgYnJhbmNoIGlzIC90cnVseS8gdXBkYXRlZCwgdGhlbiB3 aGF0IGFyZSB0aGUgc3Vic2VxdWVudCB1cGRhdGVzPyANCihUaGUgcHVsbCBpbW1lZGlhdGVs eSBhZnRlciB0aGUgc3dpdGNoLikNCg0KDQo+IEdyYWhhbSBQZXJyaW4gPGdyYWhhbXBlcnJp bkBmcmVlYnNkLm9yZz4gZXNjcmV2ZXUgbm8gZGlhIHNleHRhLCANCj4gMi8xMi8yMDIyIMOg KHMpIDA4OjA0Og0KPg0KPiAgICAgSSdtIGNvbmZ1c2VkLg0KPg0KPiAgICAgSWYgYSBzd2l0 Y2ggaXMgaW50ZW5kZWQgdG8gdXBkYXRlIHRoaW5ncywgdGhlbiBob3cgY2FuIGFuDQo+ICAg ICBpbW1lZGlhdGVseSBzdWJzZXF1ZW50IHB1bGwgbGVhZCB0byB1cGRhdGVzPw0KPg0KPg0K PiAgICAgJSBnaXQgLUMgL3Vzci9wb3J0cyBzd2l0Y2ggbWFpbiAmJiBnaXQgLUMgL3Vzci9z cmMgc3dpdGNoIG1haW4NCj4gICAgIEFscmVhZHkgb24gJ21haW4nDQo+ICAgICBZb3VyIGJy YW5jaCBpcyB1cCB0byBkYXRlIHdpdGggJ2ZyZWVic2QvbWFpbicuDQo+ICAgICBNwqDCoMKg wqDCoMKgIHN5cy9uZXRncmFwaC9ibHVldG9vdGgvaGNpL25nX2hjaV9jbWRzLmMNCj4gICAg IE3CoMKgwqDCoMKgwqAgc3lzL25ldGdyYXBoL2JsdWV0b290aC9oY2kvbmdfaGNpX2V2bnQu Yw0KPiAgICAgTcKgwqDCoMKgwqDCoCBzeXMvbmV0Z3JhcGgvYmx1ZXRvb3RoL2luY2x1ZGUv bmdfaGNpLmgNCj4gICAgIEFscmVhZHkgb24gJ21haW4nDQo+ICAgICBZb3VyIGJyYW5jaCBp cyB1cCB0byBkYXRlIHdpdGggJ29yaWdpbi9tYWluJy4NCj4gICAgICUgZ2l0IC1DIC91c3Iv cG9ydHMgcHVsbCAtLWZmLW9ubHkgJiYgZ2l0IC1DIC91c3Ivc3JjIHB1bGwgLS1mZi1vbmx5 DQo+ICAgICByZW1vdGU6IEVudW1lcmF0aW5nIG9iamVjdHM6IDMyODQsIGRvbmUuDQo+ICAg ICByZW1vdGU6IENvdW50aW5nIG9iamVjdHM6IDEwMCUgKDg0MC84NDApLCBkb25lLg0KPiAg ICAgcmVtb3RlOiBDb21wcmVzc2luZyBvYmplY3RzOiAxMDAlICgzLzMpLCBkb25lLg0KPiAg ICAgcmVtb3RlOiBUb3RhbCAzMjg0IChkZWx0YSA4MzcpLCByZXVzZWQgODM3IChkZWx0YSA4 MzcpLA0KPiAgICAgcGFjay1yZXVzZWQgMjQ0NA0KPiAgICAgUmVjZWl2aW5nIG9iamVjdHM6 IDEwMCUgKDMyODQvMzI4NCksIDEuOTIgTWlCIHwgMS4xMSBNaUIvcywgZG9uZS4NCj4gICAg IFJlc29sdmluZyBkZWx0YXM6IDEwMCUgKDE5ODUvMTk4NSksIGNvbXBsZXRlZCB3aXRoIDQ3 NCBsb2NhbCBvYmplY3RzLg0KPiAgICAgRnJvbSBodHRwczovL2dpdC5mcmVlYnNkLm9yZy9w b3J0cw0KPiAgICAgwqDCoCBmYjZhOWFmM2U4OTguLjgwYWZjNjNlZWI5OcKgIG1haW7CoMKg wqDCoMKgwqAgLT4gZnJlZWJzZC9tYWluDQo+ICAgICDCoMKgIDc0OWNhM2VjMmU2MC4uYzM1 NTJlZmUzOThlwqAgMjAyMlE0wqDCoMKgwqAgLT4gZnJlZWJzZC8yMDIyUTQNCj4gICAgIFVw ZGF0aW5nIGZiNmE5YWYzZTg5OC4uODBhZmM2M2VlYjk5DQo+ICAgICBeQw0KPiAgICAgJSBj YXQgL3Vzci9wb3J0cy8uZ2l0L2NvbmZpZw0KPiAgICAgW2NvcmVdDQo+ICAgICDCoMKgwqDC oMKgwqDCoCByZXBvc2l0b3J5Zm9ybWF0dmVyc2lvbiA9IDANCj4gICAgIMKgwqDCoMKgwqDC oMKgIGZpbGVtb2RlID0gdHJ1ZQ0KPiAgICAgwqDCoMKgwqDCoMKgwqAgYmFyZSA9IGZhbHNl DQo+ICAgICDCoMKgwqDCoMKgwqDCoCBsb2dhbGxyZWZ1cGRhdGVzID0gdHJ1ZQ0KPiAgICAg W3JlbW90ZSAiZnJlZWJzZCJdDQo+ICAgICDCoMKgwqDCoMKgwqDCoCB1cmwgPSBodHRwczov L2dpdC5mcmVlYnNkLm9yZy9wb3J0cy5naXQNCj4gICAgIMKgwqDCoMKgwqDCoMKgIGZldGNo ID0gK3JlZnMvaGVhZHMvKjpyZWZzL3JlbW90ZXMvZnJlZWJzZC8qDQo+ICAgICBbYnJhbmNo ICJtYWluIl0NCj4gICAgIMKgwqDCoMKgwqDCoMKgIHJlbW90ZSA9IGZyZWVic2QNCj4gICAg IMKgwqDCoMKgwqDCoMKgIG1lcmdlID0gcmVmcy9oZWFkcy9tYWluDQo+ICAgICAlDQo+DQo+ ICAgICBHaXQgLSBnaXQtc3dpdGNoIERvY3VtZW50YXRpb24gPGh0dHBzOi8vZ2l0LXNjbS5j b20vZG9jcy9naXQtc3dpdGNoPg0KPg0KPg0KPg0KPiAtLSANCj4gTnVubyBUZWl4ZWlyYQ0K PiBGcmVlQlNEIENvbW1pdHRlciAocG9ydHMpDQo= --------------5eesFH8rVVfaiqXl0mpsGMIZ Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On 02/12/2022 12:08, Nuno Teixeira wrote:
Not sure if I understand but I use `git switch` on ports tree to switch from 'main' to 'quarterly' to avoid having 2 trees.

e.g.
When in main and need to do a commit on 2022Q4:
`git switch 2022Q4`
`git pull --rebase`
`git cherry-pick -x XXX`
`git push`

and switch back to main:
`git switch -` or `git switch main`
`git pull --rebase`

Hope that helps

There's the statement after the switch:

"up to date"

If the branch is truly updated, then what are the subsequent updates? (The pull immediately after the switch.)


Graham Perrin <grahampe= rrin@freebsd.org> escreveu no dia sexta, 2/12/2022 =C3=A0(s) 08:04:
=

I'm confused.

If a switch is intended to update things, then how can an immediately subsequent pull lead to updates?


% git -C /usr/ports switch main && git -C /usr/src switch main
Already on 'main'
Your branch is up to date with 'freebsd/main'.
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/blueto= oth/hci/ng_hci_cmds.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/blueto= oth/hci/ng_hci_evnt.c
M=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 sys/netgraph/blueto= oth/include/ng_hci.h
Already on 'main'
Your branch is up to date with 'origin/main'.
% git -C /usr/ports pull --ff-only && git -C /usr/src pull --ff-only
remote: Enumerating objects: 3284, done.
remote: Counting objects: 100% (840/840), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3284 (delta 837), reused 837 (delta 837), pack-reused 2444
Receiving objects: 100% (3284/3284), 1.92 MiB | 1.11 MiB/s, done.
Resolving deltas: 100% (1985/1985), completed with 474 local objects.
From https://git.freebsd.org= /ports
=C2=A0=C2=A0 fb6a9af3e898..80afc63eeb99=C2=A0 main=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 -> freebsd/main
=C2=A0=C2=A0 749ca3ec2e60..c3552efe398e=C2=A0 2022Q4=C2=A0= =C2=A0=C2=A0=C2=A0 -> freebsd/2022Q4
Updating fb6a9af3e898..80afc63eeb99
^C
% cat /usr/ports/.git/config
[core]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 repositoryform= atversion =3D 0
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 filemode =3D t= rue
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bare =3D false=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 logallrefupdat= es =3D true
[remote "freebsd"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 url =3D https://git.freebsd.org= /ports.git
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fetch =3D +ref= s/heads/*:refs/remotes/freebsd/*
[branch "main"]
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 remote =3D fre= ebsd
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 merge =3D refs= /heads/main
%

Git - git-swit= ch Documentation



--
Nuno Teixeira
FreeBSD Committer (ports)
--------------5eesFH8rVVfaiqXl0mpsGMIZ-- --------------HQxejgomF7DXUpF0aLiKU3AD-- --------------Zjz9GC25O3bSmHHzkRfCEJYM Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEWT/lssMHB+28ly8Kt2dIb0oY1AsFAmOKpDAFAwAAAAAACgkQt2dIb0oY1Asc og//by9MJv75TqlJl6I9uuTvR7albK91upevp9I6NGI1wvVvGHtYJgl0kmISxoiakyQ47ie5zH4h ir/17JiBoZCFLia0jP1fHsaHE1ZSMg0loAJkduJb85FsTH6N9Os0uZuRUqaWz07D50TsJbPWJeEt DtJJmajEiag5yzF2T4eoCysrXlbTRdbOs+K13qtnCAuB8bsBTmAdY4GLXt+GutvPd8LhTMSoa521 w8JewkDiCluEiirw2nWZbi04Id+sWRMJADxNGaO8OICKa1TvdHNJs0KcIpT9Fc7P5Cyi90mBJ2xG wzvLIX5uoYN67iNsdRveBEHIAHzLvAnuhS2J3NEk6EfiVZTJuFke/DE+HMy3sCzaoDZ9dJ7Sq0RX 65VD1NkV2jXXRXvBaRijRBVgvS6Gv+91MKHPqUZqYNsQojaY0GitlW0rqXMMHXiRgsGMxTE+pSyi Rtm3+GjdyHiTivobz5TjoaZl2RhXH1zyouw7WUMFMU1fFrSbfwpaKP7UuIh8vYkb2yPvcws8lXIE atW4bBaLsNsr39TVjxL6kJ/gqYscmxCYBhi24siNCOCOqN1XzuQk25Vqk14luNCLwMxyrfvVUB/j 7t4CPn/8fzfZVFuxZlDJdsL1zNz4yYDVhnjEsL0kzNI6NjsIG0HGBVxfoWmZj+RQ6D9fX+JoneXY E4s= =kyqf -----END PGP SIGNATURE----- --------------Zjz9GC25O3bSmHHzkRfCEJYM-- From nobody Sat Dec 3 02:30:32 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPDLs2TRgz4j8J2 for ; Sat, 3 Dec 2022 02:30:45 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPDLs0SW1z3NFQ for ; Sat, 3 Dec 2022 02:30:44 +0000 (UTC) (envelope-from bakul@iitbombay.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x233.google.com with SMTP id q186so7166076oia.9 for ; Fri, 02 Dec 2022 18:30:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iitbombay-org.20210112.gappssmtp.com; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=uLCEE9ZuEomvJR4vPs38ANTmmn/6q+5s1xWDYTe1aK4=; b=l8tNsJHyd56iKCFuf5xZ2mdOtmeVuSRZJGZVgnD2Bu+XGM2hBs4sOxKAj68PmfG2/j gM+AZkCHJTgh8lvUMo2linw08nxeDdupQxnxhxWotr0F2fJUH3dleCM1CvVOGW5D9Mdd VYCSfMRN2bGvmtqeV1hj1yOgGBEORwpBgfdykPFO0vvQXs9RXOVkZc3m8qNVQ8bR74aM 5l44GSVVaTWsG1SxwcCDtHXyT7mQV+yd5Xd3ybPKw/zqAgyCX0XQI2Vi6IguHqfSlACf xSyl/cME8+xwe77t+YDOJc4DGL4gjSg4M87vR9nysnXHebsJB00rG4oHyWV+ScdjOMDN eNsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uLCEE9ZuEomvJR4vPs38ANTmmn/6q+5s1xWDYTe1aK4=; b=U+OkmQ0NGDpb60bvcVf1ub3RoPV5joeEh+S436WazYnzD2d5ihxNb4Z/4yq7rSY0fH cviwDvRbCeZyZqdwMAXJeB33SIPCPCR4AN1z9/pC2g6Q5dPO7Bcn8wsdSxcD/UTPoknY sZSdORZELxq8ayEo6i5xEsxqs1hRZX/oMtLTjqJaA/OVQbyanNtNi7MP2k4vgBXWdEdi vMKiea9cv8gknfTtvhmPMbZTb/Q7Aep1X2OXHjutuhyId1UiOPTCgCmhlBOR7vMzi2R2 P4CiX8G8RW7Q3PoXTm2i/zIJQ5im3GfDrzJkBZ7g4ociFOGo4EvhDEdm5qFirCXgy3Ev 21Tw== X-Gm-Message-State: ANoB5pnTRN8QmOMMOmi/f2KB4s04eDHO2peHSTvSFfRqHPElzIpNw4CA C8vthp0wgCgBV+4aKXQhhSRcDUXhVtpqxfuK X-Google-Smtp-Source: AA0mqf7Cx4eiKY20c4cBkpY1VPgInSu9EpynjEQlgp2blJBJ6pwL2btGkxrGXsinGJRaS/ej8pFHRg== X-Received: by 2002:aca:420a:0:b0:35b:b709:6048 with SMTP id p10-20020aca420a000000b0035bb7096048mr12727954oia.81.1670034643836; Fri, 02 Dec 2022 18:30:43 -0800 (PST) Received: from smtpclient.apple (107-215-223-229.lightspeed.sntcca.sbcglobal.net. [107.215.223.229]) by smtp.gmail.com with ESMTPSA id v12-20020a4ac00c000000b00492f9f46aa4sm3609737oop.36.2022.12.02.18.30.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Dec 2022 18:30:43 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.200.110.1.12\)) Subject: Re: git-switch(1) then git-pull(1) From: Bakul Shah In-Reply-To: Date: Fri, 2 Dec 2022 18:30:32 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <48B94C3C-6383-4CF6-9B9B-5F2EDB97FACD@iitbombay.org> References: To: Graham Perrin X-Mailer: Apple Mail (2.3731.200.110.1.12) X-Rspamd-Queue-Id: 4NPDLs0SW1z3NFQ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Dec 2, 2022, at 5:19 PM, Graham Perrin = wrote: >=20 > On 02/12/2022 12:08, Nuno Teixeira wrote: >> Not sure if I understand but I use `git switch` on ports tree to = switch from 'main' to 'quarterly' to avoid having 2 trees. >>=20 >> e.g. >> When in main and need to do a commit on 2022Q4: >> `git switch 2022Q4` >> `git pull --rebase` >> `git cherry-pick -x XXX` >> `git push` >>=20 >> and switch back to main: >> `git switch -` or `git switch main` >> `git pull --rebase` >>=20 >> Hope that helps > There's the statement after the switch:=20 > "up to date" > If the branch is truly updated, then what are the subsequent updates? = (The pull immediately after the switch. The "Your branch is up to date with ..." message by git switch is confusing but upd to date is merely with respect to the local .git. It mainly changes .git/index and .git/HEAD mostly. git pull or fetch" is a separate issue. From nobody Sat Dec 3 02:58:43 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPDz94zCMz4jDGn for ; Sat, 3 Dec 2022 02:58:45 +0000 (UTC) (envelope-from grahamperrin@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 4NPDz94PtVz3QNW for ; Sat, 3 Dec 2022 02:58:45 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670036325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9YkCINySPJI16wmiCjfGrOHfrHmHQyf9ZHh9N/QGoSI=; b=OI7t6bQC15jLctB6Utqt4/Y1Q/EgEa//mIHz/NZ64qBSZ0mj8wRaa149d31wCn8Z2zZpx3 f4NFEMop2Im4h2i8yOpIxXs+89pPwPCfIVXvu4GI4ey0QUfP2xI2W5IhuglfkrPAIjIzsD KrZsX4joFFZf+vlbWP0nwzS9i3ccbdAgNTXyozDhSwuNulhHaYxCoL6KJsepKC+HlX4/Nd WThr+cVUV9V6bP3vOhdGB/3obLmKD3AEfwR+8WfWI7lTyTZSGHwfop6kP+q231tm2Gu9la 7PwhuvoL6+Xhyi9BsCi9Q6adHAR6m5aOob8h+Lx25uCZUGkBg+NwdVgXxkOg2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670036325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9YkCINySPJI16wmiCjfGrOHfrHmHQyf9ZHh9N/QGoSI=; b=x05kftoDBXz1Ztdh08W9ygnpKUmUSNQsjWCKYbj9+7IIG+7kyduZVsn91txx19VX96QKmg LSOnWfFsmCWRQ3M8BP+LiZIdEi+E1hQKIM1/v3Mf9qeuY/W+hoSY3EYUqTp5L1Mai5h/RY Cx6DlkE2xTLYxytyOfFiGmt2dhDNoYwTLs4sbEVxO/nCQlvcR24wZtOPyayB87+lS+SYyg hWNzp17gq1OPXm92YYT+DnocKMbaEv7w2OQO6VApK1qagzDAGWHuGAGoVdAIIyMlV/Tb5s ibh1dCTslqoslHRGpVW/Dvar2BEvW4+srgqQX0vfYTN4E0Zof8kxBeNTW5hAFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670036325; a=rsa-sha256; cv=none; b=lja6jP7oYlewvCclLQ/Ue5jN/O/D6eLCKgLSLGA2OLm4YxPxM0XOiB7X7kV/JlVT52IROr qbZ1EB9VPC1uhQ3zFOE1Jlg6Ff1SVNmSXBAmKUJ+rR5HqRRHyHyqo8+t6LM/wAOOUsTDRq cyiAQB4ccSY5IowGOR3g9z8EOIEtbm9ImJYGkD6SfejGNUlXI3APAaFNRC71Gz4DFN21ID 2MYqEX/EEqzM6Urg095X4+zkBOewLpuAHob/4GggZPHQjZVYyvOfYWOFkbDWHXMmsMyiqT amjuR/Sv56k0TKc+m2zp67Uzm2sFwpjr1dYJTOCpJN4adpGtXY+SZGceHFf8Nw== Received: from [IPV6:2001:470:1f1c:a0::2] (tunnel642390-pt.tunnel.tserv1.lon2.ipv6.he.net [IPv6:2001:470:1f1c:a0::2]) (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 did not present a certificate) (Authenticated sender: grahamperrin) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NPDz927nTztZK for ; Sat, 3 Dec 2022 02:58:45 +0000 (UTC) (envelope-from grahamperrin@freebsd.org) Message-ID: Date: Sat, 3 Dec 2022 02:58:43 +0000 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: git-switch(1) then git-pull(1) Content-Language: en-GB To: freebsd-git@freebsd.org References: <48B94C3C-6383-4CF6-9B9B-5F2EDB97FACD@iitbombay.org> From: Graham Perrin Organization: FreeBSD In-Reply-To: <48B94C3C-6383-4CF6-9B9B-5F2EDB97FACD@iitbombay.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------J4lxaAVAUHtI3gpx601QlCBd" X-ThisMailContainsUnwantedMimeParts: N This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------J4lxaAVAUHtI3gpx601QlCBd Content-Type: multipart/mixed; boundary="------------vxA3neEeJhAeuC7kHNeIMRlA"; protected-headers="v1" From: Graham Perrin To: freebsd-git@freebsd.org Message-ID: Subject: Re: git-switch(1) then git-pull(1) References: <48B94C3C-6383-4CF6-9B9B-5F2EDB97FACD@iitbombay.org> In-Reply-To: <48B94C3C-6383-4CF6-9B9B-5F2EDB97FACD@iitbombay.org> --------------vxA3neEeJhAeuC7kHNeIMRlA Content-Type: multipart/alternative; boundary="------------ACoher9rLq4LOvggoU9iFG2r" --------------ACoher9rLq4LOvggoU9iFG2r Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 T24gMDMvMTIvMjAyMiAwMjozMCwgQmFrdWwgU2hhaCB3cm90ZToNCj4+IOKApg0KPj4NCj4+ IFRoZXJlJ3MgdGhlIHN0YXRlbWVudCBhZnRlciB0aGUgc3dpdGNoOg0KPj4gInVwIHRvIGRh dGUiDQo+PiBJZiB0aGUgYnJhbmNoIGlzIHRydWx5IHVwZGF0ZWQsIHRoZW4gd2hhdCBhcmUg dGhlIHN1YnNlcXVlbnQgdXBkYXRlcz8gKFRoZSBwdWxsIGltbWVkaWF0ZWx5IGFmdGVyIHRo ZSBzd2l0Y2guDQo+IFRoZSAiWW91ciBicmFuY2ggaXMgdXAgdG8gZGF0ZSB3aXRoIC4uLiIg bWVzc2FnZSBieSBnaXQgc3dpdGNoDQo+IGlzIGNvbmZ1c2luZyBidXQgdXBkIHRvIGRhdGUg aXMgbWVyZWx5IHdpdGggcmVzcGVjdCB0byB0aGUgbG9jYWwNCj4gLmdpdC4gSXQgbWFpbmx5 IGNoYW5nZXMgLmdpdC9pbmRleCBhbmQgLmdpdC9IRUFEIG1vc3RseS4gZ2l0IHB1bGwNCj4g b3IgZmV0Y2giIGlzIGEgc2VwYXJhdGUgaXNzdWUuDQo+DQpPSywga2V5d29yZDogbG9jYWwu IE5vdyBJIHVuZGVyc3RhbmQgdGhlIG5lZWQgZm9yIGEgc2VwYXJhdGUgcHVsbC4gVGhhbmtz Lg0KDQoNCiBGcm9tIEdpdCBkb2N1bWVudGF0aW9uOg0KDQo+IFRoZSB3b3JraW5nIHRyZWUg YW5kIHRoZSBpbmRleCBhcmUgdXBkYXRlZCB0byBtYXRjaCB0aGUgYnJhbmNoLiANCg0KV291 bGQgaXQgYmUgdHJ1ZXIgaWYgSSBpbWFnaW5lIHRoaXM/DQoNCj4gVGhlIHdvcmtpbmcgdHJl ZSBhbmQgdGhlIGluZGV4IGFyZSB1cGRhdGVkIHRvIG1hdGNoIHRoZSBsb2NhbCBicmFuY2gu IA0KDQo= --------------ACoher9rLq4LOvggoU9iFG2r Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On 03/12/2022 02:30, Bakul Shah wrote:= 
=E2=80=A6

There's the statement after the switch:=20
"up to date"
If the branch is truly updated, then what are the subsequent updates? (Th=
e pull immediately after the switch.

The "Your branch is up to da=
te with ..." message by git switch
is confusing but upd to date is merely with respect to the local
=2Egit. It mainly changes .git/index and .git/HEAD mostly. git pull
or fetch" is a separate issue.

OK, keyword: local. Now I understand the need for a separate pull. Thanks.


From Git documentation:

The working tree and the index are updated to match the branch.

Would it be truer if I imagine this?

The working tree and the index are updated to match the local branch.

--------------ACoher9rLq4LOvggoU9iFG2r-- --------------vxA3neEeJhAeuC7kHNeIMRlA-- --------------J4lxaAVAUHtI3gpx601QlCBd Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsF5BAABCAAjFiEEWT/lssMHB+28ly8Kt2dIb0oY1AsFAmOKu2MFAwAAAAAACgkQt2dIb0oY1At/ 7w//TKJnIu3aq3Cbu/1YjMd0gt6HpKnO0UA5koTcxeZaJFRnzXVmroY0qJw/88n3O5NXY5Bz+OOR 8wVQ1FHTiW5vKI7B30AlyAVPJ4RG34DABX29GKwAb+cZu4lo2qtSmF6VeaDX4gv4gLRgcm/c4RcS TOG9jum6rUzz7eSjvJWTpj4JUfKQSpSk71RktUjd+VsrfTmcOPFIKju3u24ve0uAaNTBEtWR4y0l YfUVz/B1vhVRYKNEVuhyyY3/djkXluOTQr9C8kuGPkLCEVb11DCrf+6ysAOrypLgupwPT+yew2gN EkxPLfbt1UmXoP4IgbdEqO4vb3EJpnLM4pgdlnnoa7MfhPm3T38q5I/JSgkkjh1Y5JOw69dJpidd baryCS4jP0RFkJem7MgCi7cEy3ypa2FP5Jw90hDbPDmec9C1/uXfFsyn3qdj3sb0qZR3k4XCJadE R0T6sgUoQNtX4UI7cRlqhP0nOqR8ynYYmb8OHzgPe4Blc0MhueTYVV03HnwVHvJ4O//vCkIGWkXk VX2FZRLOzi+cJkfAJwAy3AqS5B5RGiFK60LViE2JZQ0lPdxcZXb5U9gxSJAd4T5WHrY0qpQUQhJ4 WCJ6d7bnXphgDVcylRWUuNhQi3H2ccepV3uad6zTXQnmzp0/V0N88RMRilciq9LoKm1Fzi6cWwE8 X6I= =cAPW -----END PGP SIGNATURE----- --------------J4lxaAVAUHtI3gpx601QlCBd-- From nobody Sat Dec 3 03:03:11 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPF4d6JLYz4jDy7 for ; Sat, 3 Dec 2022 03:03:29 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic316-55.consmr.mail.gq1.yahoo.com (sonic316-55.consmr.mail.gq1.yahoo.com [98.137.69.31]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPF4d3TBhz3RGS for ; Sat, 3 Dec 2022 03:03:29 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1670036607; bh=OH90h7+h+apqmij0I6+d8Nni5636Cf+FSzE7KVgMQ6s=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=Vjgru3gI/zZrLwYdqkX7mE9ouHugiA4u565u7PIUQcNt3bFWv5W8CoNKY2ZaWzliYgGHFmThd98kVoWmvygNfTD5qKZgzEZkvbi3DzmchaYKVphoy2MrCxSg/4DArluZzJ+EiuosQVrBHDUuf0+9taqO6Llh/wqZifVXZ0NZiTolhANNoslAGtpCN0SHtRP2HzGgnyax31izvPTTHwK7QtELoY6qnyHyJu4enwe6ICol/Uqt+0d1pJq/JCzD4p9aZ28TmhkcNLTDQY33nsC6GtZVTtcFXXMSZ/7GzWatOIG8KgShzZ6+PDF6bS93mOMdIjQDKYMo4DdL3I1H7lANlA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1670036607; bh=kY8LEbsdOHeUXFSJr6H+juO51YmjvjHtMtDGmSHHZM8=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=YSEi3ML6uP0Tj5KVElXYdc0kwQvueFl6pHtJBgKvIEXTq/g/nDqc3fSsZIMzEvLZH6ljGTvhSQY08DR4bgH0UBEOAwnAPVgezqAtuiyAUlUl8YpSK1HzKG7JQ9JvXyFE/jUxOG/4i/8cHOo1kw7xxAZMKwoBJ+qrY5NhH0AmCTV1OLXKWv4r7fgiMdiP7fXCjoLyvHnvjHJ4knhJA5nmiLWTBXtKt8BzlQB98U99bMadj8ycMBoJGeHKLWoCgdZ/tGEiGbbPJ7+P1ccZlVooPc144U3ojkhAEsLvu2mrxYNw/cnfcaUFL7xymekrtSk+4E9kJDO0dXSLgivW6WM+xA== X-YMail-OSG: bHRigDIVM1kZoqmZ20SsBVYZkGp5adU.StHGdo7OlLMTKxNUHLaOmcL_QkyFQus Vgzv9u.vGQq_Qw2oqYT28dUoMm2VYrOukD2Xx5SUlP7jH2bKbjFkQVOk8feoD7IXI6vS13spA.Pj _Pxy5O5.rHozScsymvvIzSQAe_KqgX66W0ZML.nYylAZimbUTT2kUDYAkGpMTftgzuyuz5JWQa02 powV_qNqfiTNIrOFRPS7nGtjh4HTNk1p5HX23JAZbySqSlGHzXQdtVcPLq_XLgwJluoTSaACz3VI 2Ve8mW.xXdEU9RkOmlZOokgn4mG90.6orVnQLhH9tsO_irCPHbqmLu5eB3WiNoL7gDzG3d7ukSLo kVmp.RYPk7l05cRos7VXVDZ3khX5vb90ZxIbcu2w9pQBmkJvaIFUcquSG_2_hHm_8ti7l_XlMb3K zjQ0e.M82EhJx9lCNtB7Tw2RUwljW3nmm.dqIQ6ka2Nb6leWvEnaD6JBIGWIoyIIglZT3FKr8WOK Px_WorUTpv9m.U4PP2.7TZN_dSuPJauOiuaNhw6Ssz2lCzYI5qCHio5rhN0LHwFEbuYDid0hK1pi CfF9QZjztgiYu_h2Soitc_LweYpZ8IUhZOb_HvJNYUUlcAWKYC.uyYZStuBv3Kax7coqgWpSK_UB keBB1vXZ_YbBQIRYnY8KvLcO6GXMkEdQl0NfgNGwfyBSQkoU7Wm2hkMJy2hLPX5HsRfjUYjv2.fS Ye92af9ruafqjtbncAwlEu49jbHIWtTy2AQCMFyqm79iCEAu.wBNanwjMzRHYbPrrd5W4.tkqMcv qdIAV80QN2ZOyZRugzfXxRIaLvh9zhx5qNvtBH5oDiNysdlW.vxDrNYDDdgROOWJpuxQTg9gLDzQ wgSoIiNs2zABvfKa_zQCwbWvAOkXFiMBTpvHYbwVcGfy0lJ3YD_fNtzxqcGmAtj4aataPkFSMEwE h8O89iVBP158hdeO6.721pXzWec0Rx6bc_iOFtTc68puem2_mZtPgYDQWtvwQ0KmlXdzSyErwURD F2w1WBywi_1PL84Fsswm7tHDqggM53i9HvtL7DFNdx4Pz7nOAsEBAjCZxm1NsGyDSS157pOZUSjK oB8K6tee4Zytigo_FclXue249BsrqcK72T3vBi5DexVSM_Nvxa3hRAaLflHDFG18TkAcbdPQRkqM 3KQF6vETFm0O8nHkqaESNA0vj2Un7MaI1QbXXE4FW6ZJ7RdxxIGodRzS.NmFYZ8mOMRhm.0_tuHx kpst4zkNYpElxPsOg5JN04IpFTQztUGKUZOsp6MbU6ihlZkIEEOti_X1d7G0reEMBGUaWYVj2mQ. kveiKtqq9O3X6Pvt11jMP_G4N3irDvoXvqWiukzWiZ3Wn5LqinfBQ5sMOWrXHeE7lyw7zF3VtgKA aC44U.o1Em8uJvu0Gl.fs0nDjGYoe4OSz_5Z9rqc7Bm6dtfs9V8HQUXJy99dbNJDpvZ8mHaU_Y56 .Sah.x4054wx7vAoC1Skw0OwRyleiArcbKYI_lYA8flLRldKUx2L8.8U7peNEulOzW8N.1G0lGgQ FUn5EVcY4dVtVyjIldykr.79wbm0N5THncLRNbY3d.CbN88Xp3KYMPEk.8gD0wMRV6GSQXOksseU sewCbWIJtSkEe215CXnMike7.WMS8iAplDmZQLaS59Ku65RtUcfF5cJwmL1BjgxMajmIw.bclQb6 dRwi9BuLv5PUzk.nJJUA.HeZc4PQl3IZwWK7uI7RfwBenMkvDsXu8bwa.uXIh1wChJ.zPLoaxUCx 2Io.r2T3GT8_WMT.t7oAbAFftnKzDVoKUegycL0N7VnwSaIRtYCnOQ0SfNijBx05jGvonsb4bCQ. W8duNHgiGgjIuSXle5zm8xGUkW.XAC1ULO3bD_F3fyTkwH02vJjUz4xEcqJu415M147VlNl36xUR vh45VuSYQVF1iL0lbRfjSxTgtTTQS8Lsmi24eTDcR2WRHsnLuC3qn3UVskEwL6DfQ9I7TpGwPmk5 9PUDuRHemDyURUaAmw36ynbi0OjehVAxRptZUyc4RQ3Kkz72QiPV77GTtxiiGWOEd5pNiCvGn3ZZ JhRlhN8C21WFmJiGmbBEyw_vAeSYllblgKHLyQr0puTgPqjmVCIaft5HHiHhXSmO6MPchSNn4miB WCo5_.WIb_FHVxwzRH3gNZaSmfMSKNQVkojKX_7mJvhKegAyF.67wGAAOtE5rhvay4BdVrn8wWuo NnjrlRGco0iRYd3WtB8UXyfT3oFnmXdBgf.D_JOuLZyAPbbQSZYSyLIzF3dedWwqXYVjXZscvU7M - X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.gq1.yahoo.com with HTTP; Sat, 3 Dec 2022 03:03:27 +0000 Received: by hermes--production-gq1-d898c4779-kmgvg (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 7548267b4845e068c34afb0d1bc6896b; Sat, 03 Dec 2022 03:03:25 +0000 (UTC) Content-Type: text/plain; charset=us-ascii List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.200.110.1.12\)) Subject: Re: git-switch(1) then git-pull(1) From: Mark Millard In-Reply-To: Date: Fri, 2 Dec 2022 19:03:11 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <2C2E55E9-3D3A-4C5C-A7EA-69A77C5D8511@yahoo.com> References: To: Graham Perrin X-Mailer: Apple Mail (2.3731.200.110.1.12) X-Rspamd-Queue-Id: 4NPF4d3TBhz3RGS X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Dec 2, 2022, at 17:19, Graham Perrin = wrote: > On 02/12/2022 12:08, Nuno Teixeira wrote: >> Not sure if I understand but I use `git switch` on ports tree to = switch from 'main' to 'quarterly' to avoid having 2 trees. >>=20 >> e.g. >> When in main and need to do a commit on 2022Q4: >> `git switch 2022Q4` >> `git pull --rebase` >> `git cherry-pick -x XXX` >> `git push` >>=20 >> and switch back to main: >> `git switch -` or `git switch main` >> `git pull --rebase` >>=20 >> Hope that helps >=20 > There's the statement after the switch:=20 > "up to date" > If the branch is truly updated, then what are the subsequent updates? = (The pull immediately after the switch.) "up to date" is not explicit about what is up to date relative to what else that is around in various places. git switch is described via: Switch to a specified branch. The working tree and the index are updated to match the branch. All new commits will be added to the = tip of this branch. What is up to date is the working tree and index relative to the .git/... vintage that you have and only the material from it for that branch that you have switched to: no longe rmaterial from the prior branch. There is "git fetch" for updating the .git/... vintage without updating any branches to use the new material. Various forms of "git merge" does that second part --but only for one branch at a time. I'm not aware of a command that updates all branches all at once to match the updated .git/... material, much less all working trees and indexes as well. "git pull" variants do both a "git fetch" and a "git merge" for some branch. But it does not update the other branches to track the updated .git/... material for them. One does not normally deal with an overall global "up to date" status in all respects for multi-branch git repositories. For example, I deal with branches releng/13.* , stable/13 , and main [so: 14]. But I almost never do anything with any of releng/12.* or stable/12: so, normally no merges for those. I actually normally do fetch and merge separately, doing multiple merges of multiple branches over some time after the fetch. By the time I'm done, the freebsd repository has probably been changed. Basically, rarely or never "globally up to date in every respect" relative to the FreeBSD repository and my local context, always just some more specific, limited concept of "up to date" that is of interest to me at the time. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Sat Dec 3 08:48:52 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPNlL3nFFz4k2Fv for ; Sat, 3 Dec 2022 08:49:02 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [IPv6:2001:470:1:117::25]) (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 "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPNlK5Sc1z4Cpv for ; Sat, 3 Dec 2022 08:49:01 +0000 (UTC) (envelope-from delphij@delphij.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=delphij.net header.s=m7e2 header.b=VMOMhgih; spf=pass (mx1.freebsd.org: domain of delphij@delphij.net designates 2001:470:1:117::25 as permitted sender) smtp.mailfrom=delphij@delphij.net; dmarc=pass (policy=reject) header.from=delphij.net Received: from odin.corp.delphij.net (unknown [IPv6:2001:470:48ca:5:4cd3:7719:35aa:6a80]) by anubis.delphij.net (Postfix) with ESMTPSA id BD8852FEFD; Sat, 3 Dec 2022 00:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=m7e2; t=1670057333; x=1670071733; bh=cFwEvz6LTcgg+yHM+bcBWcESMJ+iS5pGj1iwQjLME30=; h=Date:Reply-To:To:References:From:Subject:In-Reply-To; b=VMOMhgihoSr1+wm8a0QtLiyumNyIYgxRzNULyBSZzO9d4qj0uok62Mq2bhG9Tt8Iy kLXXNvVTJUUVdeNAOQxLzFAsOHjS39btNcJ6V9AZEId7Eb4pwziOh767ol5rO1wVPe lQKhEIaaH3scVG2okqZooZYKpRoISLFqunX5TUJFHHnpR2GFZcNN9o0XXmiSh/cONK JVR1jY6BIKDwIO+BDmjB3dXUxT4ldq8pM0IDyXEYOfOdTJqBQRv3606diVDIsvqlFX +AFQYlvOjJfuc2aD5M2x1hSNNG1b84EJ51QZYLlKoPgZ2Mb6qqkGyFvxDvlB9Alo41 kPo11F4iFsITQ== Message-ID: Date: Sat, 3 Dec 2022 00:48:52 -0800 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Thunderbird Reply-To: d@delphij.net Content-Language: en-US To: freebsd-git@freebsd.org References: From: Xin Li Subject: Re: git-switch(1) then git-pull(1) In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-3.97 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.983]; DMARC_POLICY_ALLOW(-0.50)[delphij.net,reject]; R_DKIM_ALLOW(-0.20)[delphij.net:s=m7e2]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; DKIM_TRACE(0.00)[delphij.net:+]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[d@delphij.net]; RCPT_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[delphij]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; TO_DN_NONE(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4NPNlK5Sc1z4Cpv X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N On 2022-12-02 4:08 AM, Nuno Teixeira wrote: > Not sure if I understand but I use `git switch` on ports tree to switch > from 'main' to 'quarterly' to avoid having 2 trees. Somewhat unrelated to the original topic, but why would one want to avoid having two trees? Personally I would use a worktree for this purpose, like: $ git clone https://git.freebsd.org/ports ports/main $ cd ports/main $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 Then both trees would share the same set of git objects; after use the worktree can be deleted with: $ git worktree remove 2022Q4 This is a lot easier than switching between branches, especially when the two branches diverged a lot (like src/). Cheers, From nobody Sat Dec 3 15:59:06 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPZHp2yj6z4jjTp for ; Sat, 3 Dec 2022 15:59:18 +0000 (UTC) (envelope-from eduardo@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 4NPZHp2WH8z3sRQ for ; Sat, 3 Dec 2022 15:59:18 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670083158; 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=ZcU7QHRlDcljHeR0N5YdncWlNL7qFrJKRLRoC+YAF7Y=; b=Ik7kt0gtGOFJm+Un403aKE9ZvRf/x5csJaKoAMEf5u6erbwuClZLpjjHJypV4jn53KtL/T 1JdUsEbnMv4D/8Mpr7BNEZM9TzqKPDoMsTRta71eZ97YeVyTahMRdouwZRY9NWSDBBioCi v0QwN+5HW7HBlsgZOd/H/cElTiVY8hxZ0aX5sDIVnR2yc2bfbSUSPJMFpXYDkkI+nOEkRa kIi0Z8EegsU97UCbrEjncH60HralhfcwVM7Usn6AoYkUfzFJX0/a4eHmNaaDAd6uyb4cIN tWC6rrezncqbVow7XT0xk7olxWA08gmC2+WrVPfMJjah0IpbWH70VUeCjbyGPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670083158; 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=ZcU7QHRlDcljHeR0N5YdncWlNL7qFrJKRLRoC+YAF7Y=; b=ual6wEYdZTb/8Oue+ahv0cPTnNsaJ2B3BtnRNuGsBtgrnSYQ3kn8Iz9bxowZWC4mkncbwq BT1RAE9xgg8s1T91aNB6NOM2JxF7kXFJXUH9orPZzcvidDsoglD9FqOM/DvDivW31Gi7uG KFPOgs+RGqLad7w77FZext6oPImSOTeOuzN83vaMzNuXFizAObPOWt0rThZ3msPGYb2m8w qxTNSQD/bwWRyd69gh4gEx0SQ2uWtBBb9HdsoLYyKPJXY7shWhGPCwxdUaWhm0LeuwiVLr RaneE9OS8vxlA5TOld0CJunx950jqrsOK+7R7acYUDOtvYvL6C+SbkvX5Yg1aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670083158; a=rsa-sha256; cv=none; b=U5p3w1ODXEdFxlzik3wndJA5By2ysy/2pbntXMVRddgYP1pPCqUMO6rAuLnaWcI7QmujpY eEzXp0IW53XcyPRxfkUHAC2Z9BFkjvTj9MVAxS3mAsSwswtmLwQNr8KmPp4hzj0fwNHGmt lMgrDqFnJcK/u2Z2iBj6ww1NjtGLvbZ3q3OWmc1BVlV0hA3AuOdPHtn1L7Zp74kHdaXqew 1mj0ixy0JFZbkOw1hEtzhB7mO+ykzre9NG6iSnVKS0RFUzFLO77xMIBiYntP3Xk5hGrsD/ eCRemiFMMu9dWE0EOBIUIiXq+ByHOTZb3pEQIu414HmDp9UhTJvFj2MDvDmUyQ== Received: from mail-vs1-f49.google.com (mail-vs1-f49.google.com [209.85.217.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 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NPZHp1Mg1z17Dq for ; Sat, 3 Dec 2022 15:59:18 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vs1-f49.google.com with SMTP id 128so7305994vsz.12 for ; Sat, 03 Dec 2022 07:59:18 -0800 (PST) X-Gm-Message-State: ANoB5pnYmdI9tG4ydC8+1wePFuXYzC8sRcbFSVTWMqyFvC55xi3FVLGU D72GRPnBnIs39ntArNwawWD6WUXs/CO6Ltmhnak= X-Google-Smtp-Source: AA0mqf4XdY6QH3QNWbhIV1xSfLbgoxh5oflbfzS1PbmE8JZmoSVxqKJUpyRCRj9wW75duqYTWPpaK9a0w62y2qnzeEk= X-Received: by 2002:a67:cc0a:0:b0:3b0:a0ba:208e with SMTP id q10-20020a67cc0a000000b003b0a0ba208emr16201777vsl.19.1670083157798; Sat, 03 Dec 2022 07:59:17 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Nuno Teixeira Date: Sat, 3 Dec 2022 15:59:06 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git-switch(1) then git-pull(1) To: d@delphij.net Cc: freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000005db1de05eeee899b" X-ThisMailContainsUnwantedMimeParts: N --0000000000005db1de05eeee899b Content-Type: text/plain; charset="UTF-8" Hello, $ git clone https://git.freebsd.org/ports ports/main > $ cd ports/main > $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 > So we will have ports/{main,2022Q4} and cd to main or 2022Q4 according if commit is to main or quarterly? I will try this soon because swithing from branches is not the best way (but I used it for about 1 year without problems). Thanks -- Nuno Teixeira FreeBSD Committer (ports) --0000000000005db1de05eeee899b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

$ git clone https://git.freebsd.org/ports ports/main
$ cd ports/main
$ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4

So we will have ports/{main,2022Q4} and cd to m= ain or 2022Q4 according if commit is to main or quarterly?

I will try this soon because swithing from branches is not the bes= t way (but I used it for about 1 year without problems).

=
Thanks

--
Nuno Te= ixeira
FreeBSD Committer (ports)
--0000000000005db1de05eeee899b-- From nobody Sat Dec 3 16:16:30 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPZgw52WBz4jlHS for ; Sat, 3 Dec 2022 16:16:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPZgw34Zmz3wNs for ; Sat, 3 Dec 2022 16:16:44 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62e.google.com with SMTP id b2so18159461eja.7 for ; Sat, 03 Dec 2022 08:16:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=BTV72uQNhRac02mz/TZ0JBgmvKf0pjUx5n7lk71pq94=; b=oy+FpR1dMNiM4Bs9NtF1Kmbe+koXzCWu+fXe6KD9lq0+mqO8NXV7mJDSLJcGVRuNIo lnVpEQ+EX7U/rxPtlY5n3mP25fLkYh8fPWSmWjw7CLh20lwPsT1tvOyTOsyG5csIdMWI kU9oi3mLtg64LL2FJteBOqzJ12hTNMiUo8FqEUW00ibFOIqyApAC5YirlFLgZmXbjswM S/VFa/GTq8CiQcdcbPWNOlKBD81MOM4a56uoW53UNER/N4csLo7/IcezQd1BfbkRMk6a vSaNs3HPbxbO088IG1lw/8xBa2chGkoGdjPths6XsXlVs2Aq454KKPgdfPv4k+toZtEb mkng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BTV72uQNhRac02mz/TZ0JBgmvKf0pjUx5n7lk71pq94=; b=VMT5nyntUBzY3vkDLfyUmpSzhxyPZ970Uv/sOknWXrHnFdkUvA5L4GCCOi7fa07/Kf vm0Mq99gygpf9LatJ6MxXjd/1wOa1o/ciHxGHLaN7Q9aqvB4pA9K3FmRPePZ/yjj4SMD Hcl1qqz8Xb+SPBgCFk33VGzvQJy8ksPL0xqli1kgOeERgbBTDyXsr5sJSKHLsSpNIX9K P0aFrqoU9FLodj5Ql/58BvQmAjwRBR4jVrXY9evtJzX8hIEY4/rS9TPHqQS/ayhF0Z18 Q0OtrTHAEZzS19EortTiHtuW3NjTJ5wreqA1+5ZixEQWTRD9KMlWzSl2fZrhrHhRqRUb XlqA== X-Gm-Message-State: ANoB5pkjeZBbln2hs8o9SzdIKNyyw5w0JR2N4pJTlYoQCIQZY7X6sxYv 2LWJI6bCHaQGRU4K5OtdnHYHLYjBEKWRv1Ctyba83w== X-Google-Smtp-Source: AA0mqf51e51ZViowoJWRxMzqBZwusmrjZlpz7wi9Jr++uQHOsRB8JdrNt3Owweg/L7msMV8EcyOjjpYGkx5+s73rhK0= X-Received: by 2002:a17:906:29c3:b0:7c0:e0db:f136 with SMTP id y3-20020a17090629c300b007c0e0dbf136mr1052890eje.333.1670084201941; Sat, 03 Dec 2022 08:16:41 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sat, 3 Dec 2022 09:16:30 -0700 Message-ID: Subject: Re: git-switch(1) then git-pull(1) To: Nuno Teixeira Cc: d@delphij.net, freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000009a25c805eeeec7af" X-Rspamd-Queue-Id: 4NPZgw34Zmz3wNs X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000009a25c805eeeec7af Content-Type: text/plain; charset="UTF-8" On Sat, Dec 3, 2022 at 8:59 AM Nuno Teixeira wrote: > Hello, > > $ git clone https://git.freebsd.org/ports ports/main >> $ cd ports/main >> $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 >> > > So we will have ports/{main,2022Q4} and cd to main or 2022Q4 according if > commit is to main or quarterly? > > I will try this soon because swithing from branches is not the best way > (but I used it for about 1 year without problems). > I do this for my src commits. I have 3 trees: 'head', 'stable-13' and 'stable-12'. I have a lot of branches off of head for work in progress that I switch between all the time to refine, finish and land them. For especially large projects I'll have a separate work tree, but usually the changes are small enough that this works fine. I have a script that rebases everything once and a while to keep my branches in sync. For stable-12 I have a stable/12 branch locally that mirrors upstream. I also have a stable/mfc12 branche that I 'insta-MFC' changes that I commit to head that need time to cook before being pushed. I do this so I don't lose things. I then rebase the stable/mfc12 onto stable/12 and push when the time comes (doing the rebase dance as needed). Warner --0000000000009a25c805eeeec7af Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sat, Dec 3, 2022 at 8:59 AM Nuno T= eixeira <eduardo@freebsd.org&= gt; wrote:
Hello,

$ git clone https://git.freebsd.org/ports ports/main
$ cd ports/main
$ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4

So we will have ports/{main,2022Q4} and cd to m= ain or 2022Q4 according if commit is to main or quarterly?

I will try this soon because swithing from branches is not the bes= t way (but I used it for about 1 year without problems).
<= /blockquote>

I do this for my src commits. I have 3 tree= s: 'head', 'stable-13' and 'stable-12'. I have a lo= t of branches off of head
for work in progress that I switch betw= een all the time to refine, finish=C2=A0 and land them. For especially=C2= =A0large projects
I'll have a separate work tree, but usually= the changes are small enough that this works fine. I have a script that
rebases everything once and a while to keep my branches in sync. Fo= r stable-12 I have a stable/12 branch locally
that mirrors upstre= am. I also have a stable/mfc12 branche that I 'insta-MFC' changes t= hat I commit to head that need
time to cook before being pushed. = I do this so I don't lose things. I then rebase the stable/mfc12 onto s= table/12 and push
when the time comes (doing the rebase dance as = needed).

Warner
--0000000000009a25c805eeeec7af-- From nobody Sat Dec 3 18:15:14 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPdJt3z1Fz4j2nw for ; Sat, 3 Dec 2022 18:15:26 +0000 (UTC) (envelope-from eduardo@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 4NPdJt27rbz49vd for ; Sat, 3 Dec 2022 18:15:26 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670091326; 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=MECD+q8C2rhlmt3SGGrt9ZHOLR7oj0EqY3i15pupaCA=; b=c4CDpcbmrN2/MhAH4QdXtfjX/Ac1hlQFe8jUf5DR4oZmNMWyybqqgnX/dlAQrXVMUjE06w FEH2KZJFUdkLhG7Xi9feAPBXRM7/bRv6yCnjSvMMGVymjNIsKWxB/9CjRiGkLcrL0cBdaH sPBTKMcKxMjNQzeVZGXA0M84jE7WI8bwtPEuWwpjYUg/bRYTrZ1NimUorZuZvHUZJHM2vq FKkmcDqvbrzR030pjkMibzN581Hdcz838yjbkbG9Nil9nJd9g381JcBnxq9chVn6/DFUl4 LLoF6igfua3GYBrqsz5qc0LxUmrLhQufhV+HDFLRg9ho+u2cjg+Sz1C9Eol7Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670091326; 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=MECD+q8C2rhlmt3SGGrt9ZHOLR7oj0EqY3i15pupaCA=; b=mo9Y6QXUE1gAZJqW7cbOS4usjfL0xelUfQi9S6Vd0S+FlCKfa6uBzKmJmeluDoJJ7E/RCx fQo/1zbUomMuOrdhNwzH9Fxh+KD4UoXezF+BfIDu4g1HTR5E/U/EsNo/CdZjMjpQHUIhMr tDarFJmujXyOrKOw8rIcpeiierlFRRZx4/PjXNZI6wwqp1abe89XJlhmLqnA/eFApGKU3U DTyc6Axknvyejsm8xShLkDcQ4WvLG+54P8uWD5RebpOTjfZmBpg8F4XQ+g6CXPopw8NWvn NaH8sVoC8lcO7ycr0AKDy/F0VQXOLXGg+fc8lB0E9dhJ5Ox43/YzI7ZbLvrvLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670091326; a=rsa-sha256; cv=none; b=vJM6drxYDV6zqsVyYcyxf228imneSake0hWNoq5pf5rrmZkzIohC8/cd+du46i+V+Ju+ZF XHWRliMpRlkrXmwcSnxFtgmkEk6rtBFPXnFkYoM9+qbvKNse3qiUFbTCPl3X3J3f1m2vVw YVg8sl6cmHFB5bjTtobbbefoYrhQidl0jgkaTUlbS5oCRZSFC1iOHBfG9gj9DT6AjCFaiU MJ4fefyrzKE8StFN5bmoM7446Hm3mLnY4yZG+/q44XIpeQfeBBGXvbbDG5+hydO7gfAcIF yZ4bwK9dwoG4gRDySPMLseoB12jiso0B0oeTVXerC56i67zMPcUxG/tnUCbOeQ== Received: from mail-vs1-f54.google.com (mail-vs1-f54.google.com [209.85.217.54]) (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 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NPdJt0fMnz19Gc for ; Sat, 3 Dec 2022 18:15:26 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-vs1-f54.google.com with SMTP id i2so7543729vsc.1 for ; Sat, 03 Dec 2022 10:15:26 -0800 (PST) X-Gm-Message-State: ANoB5pni2pl9SiPfMxQjauBzbR+mKbItBj+qfTB0Yvs1jpeJ5xBIkiFY yWPDL98KYnTdHp30pqStnOu0P4asV8rqBtmx1hI= X-Google-Smtp-Source: AA0mqf7E8ZTQAfzf6QGDPCG0T131fN02Qo5b+N0HdDyhM+YeLNP7J5FORf/0CIz9UO79upP/wr4pUQ9OX+4O62t1GC4= X-Received: by 2002:a05:6102:3205:b0:3b0:94f7:5a10 with SMTP id r5-20020a056102320500b003b094f75a10mr19364652vsf.53.1670091325667; Sat, 03 Dec 2022 10:15:25 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Nuno Teixeira Date: Sat, 3 Dec 2022 18:15:14 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git-switch(1) then git-pull(1) To: Warner Losh Cc: d@delphij.net, freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000003580e205eef0705d" X-ThisMailContainsUnwantedMimeParts: N --0000000000003580e205eef0705d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Really nice. I'm thinking on 3 trees for ports: - main (push) - 2022Qn (cherry-pick, push) - test (push to main when testing done) $ git clone https://git.freebsd.org/ports ports/main $ cd ports/main $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 $ git worktree add ../test -b main origin/main My question is how do I push a commit from 'test' to 'main'? This sugestion is because I can have several ports in testing fase on 'test' branch and choose a specific commit to push to 'main' (local branch) and then do a final push. Does this makes sense? Warner Losh escreveu no dia s=C3=A1bado, 3/12/2022 =C3=A0(= s) 16:16: > > > On Sat, Dec 3, 2022 at 8:59 AM Nuno Teixeira wrote: > >> Hello, >> >> $ git clone https://git.freebsd.org/ports ports/main >>> $ cd ports/main >>> $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 >>> >> >> So we will have ports/{main,2022Q4} and cd to main or 2022Q4 according i= f >> commit is to main or quarterly? >> >> I will try this soon because swithing from branches is not the best way >> (but I used it for about 1 year without problems). >> > > I do this for my src commits. I have 3 trees: 'head', 'stable-13' and > 'stable-12'. I have a lot of branches off of head > for work in progress that I switch between all the time to refine, finish > and land them. For especially large projects > I'll have a separate work tree, but usually the changes are small enough > that this works fine. I have a script that > rebases everything once and a while to keep my branches in sync. For > stable-12 I have a stable/12 branch locally > that mirrors upstream. I also have a stable/mfc12 branche that I > 'insta-MFC' changes that I commit to head that need > time to cook before being pushed. I do this so I don't lose things. I the= n > rebase the stable/mfc12 onto stable/12 and push > when the time comes (doing the rebase dance as needed). > > Warner > --=20 Nuno Teixeira FreeBSD Committer (ports) --0000000000003580e205eef0705d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Really nice.

I'm thinking on 3 trees for ports:

- main (p= ush)
- 2022Qn (cherry-pick, push)
- test (push to m= ain when testing done)

$ git clone https://git= .freebsd.org/ports ports/main
$ cd ports/main
$= git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4
$ git worktre= e add ../test -b main origin/main

My question is h= ow do I push a commit from 'test' to 'main'?

=
This sugestion is because I can have several ports in testing fa= se on 'test' branch and choose a specific commit to push to 'ma= in' (local branch) and then do a final push.

D= oes this makes sense?






Warner Losh <imp@bsdimp.com> escreveu no dia s=C3=A1bado, 3/12/2022 =C3=A0(= s) 16:16:


On Sat, Dec 3, 2022 at 8:59 AM Nuno Teixeir= a <eduardo@free= bsd.org> wrote:
Hello,

$ git clone https://git.freebsd.org/ports ports/main
$ cd ports/main
$ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4

So we will have ports/{main,2022Q4} and cd to m= ain or 2022Q4 according if commit is to main or quarterly?

I will try this soon because swithing from branches is not the bes= t way (but I used it for about 1 year without problems).
<= /blockquote>

I do this for my src commits. I have 3 tree= s: 'head', 'stable-13' and 'stable-12'. I have a lo= t of branches off of head
for work in progress that I switch betw= een all the time to refine, finish=C2=A0 and land them. For especially=C2= =A0large projects
I'll have a separate work tree, but usually= the changes are small enough that this works fine. I have a script that
rebases everything once and a while to keep my branches in sync. Fo= r stable-12 I have a stable/12 branch locally
that mirrors upstre= am. I also have a stable/mfc12 branche that I 'insta-MFC' changes t= hat I commit to head that need
time to cook before being pushed. = I do this so I don't lose things. I then rebase the stable/mfc12 onto s= table/12 and push
when the time comes (doing the rebase dance as = needed).

Warner


--
Nun= o Teixeira
FreeBSD Committer (ports)
--0000000000003580e205eef0705d-- From nobody Sat Dec 3 21:02:20 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPj1v2cGtz4jQYV for ; Sat, 3 Dec 2022 21:02:43 +0000 (UTC) (envelope-from dch@skunkwerks.at) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPj1t29PNz3FmV for ; Sat, 3 Dec 2022 21:02:42 +0000 (UTC) (envelope-from dch@skunkwerks.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=skunkwerks.at header.s=fm2 header.b=ctzz07iQ; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=fJUoBUIn; spf=pass (mx1.freebsd.org: domain of dch@skunkwerks.at designates 66.111.4.25 as permitted sender) smtp.mailfrom=dch@skunkwerks.at; dmarc=none Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 2F3B45C0032 for ; Sat, 3 Dec 2022 16:02:41 -0500 (EST) Received: from imap44 ([10.202.2.94]) by compute1.internal (MEProxy); Sat, 03 Dec 2022 16:02:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skunkwerks.at; h=cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1670101361; x=1670187761; bh=v7/BRJ6yov 6zLPxTgW1s64o2JgrOh0Tn0liYEP6SEf4=; b=ctzz07iQ+CiDpnin3hPALeorQf A2NMYuEg5F0NNSLmhKKYXy8P4rH1q0So5J5hN7dlKcteNuGdqnxhU3lM5FN6j+od 5mNnDKOBjkcFQhSkSgaHcR8sChlLzOg7AMVf0W/o1qLsrZRIAOXYoq0Opti+FY0l DQBCB/WqjOFXgEbJoT4oHztfHM25dq3cJjmLrK2xq8MUpbIJ7mXta8H1RGbBPNMC WyNtv7WAdwO2aNKB7NzYH+egesiOb7+X5I12morpAJCWqwI8oGcgP9PSfb8J7qoT YjJax+hgTuQ548mrPuPQWZm1qm8sDqkFv0U+c52gPjSz1kydVtcMeV294iKQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1670101361; x=1670187761; bh=v7/BRJ6yov6zLPxTgW1s64o2JgrO h0Tn0liYEP6SEf4=; b=fJUoBUInAD+mehQOFppTjhj/O947W/Bb9zox2VKdb6vV UCD7xNw91Tucl2AES/8icjjNWvJhM2fqUY4Y95wgyfc+ufN8cr2hAX46LmZnu05C xWge9YG6cHPbaASHtJlh3bh5BHyVtaVfuDSl1wlEnF6/lrEmeHK2rt7JoRVY966U 5LThTElD+D7WoRe9q4s1FZULvutLlXMwaIPp0N6/3RTb74hDzR30lxpLwFSC00lc 2mlfThdrHyGvqaqLucww9f10uiWKwwsOBIYlfgZ+rr2PynclGcOZlKQ/uO8N2Mlc UpWzsv3TtAqNPesVqbNyPDE3XzfgicJiOuox7R6dng== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedruddtgddugeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtsehttd ertderredtnecuhfhrohhmpedfffgrvhgvucevohhtthhlvghhuhgsvghrfdcuoegutghh sehskhhunhhkfigvrhhkshdrrghtqeenucggtffrrghtthgvrhhnpedvteeljefhveetie egfeeggeetjeeiffdufedviedvgfetieehgfeugffghfekheenucffohhmrghinhepfhhr vggvsghsugdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpegutghhsehskhhunhhkfigvrhhkshdrrght X-ME-Proxy: Feedback-ID: ic0e84090:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id DB4B936A0075; Sat, 3 Dec 2022 16:02:40 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.7.0-alpha0-1115-g8b801eadce-fm-20221102.001-g8b801ead List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org Mime-Version: 1.0 Message-Id: In-Reply-To: References: Date: Sat, 03 Dec 2022 21:02:20 +0000 From: "Dave Cottlehuber" To: freebsd-git@freebsd.org Subject: Re: git-switch(1) then git-pull(1) Content-Type: text/plain X-Spamd-Result: default: False [-4.13 / 15.00]; DWL_DNSWL_LOW(-1.00)[messagingengine.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.94)[-0.938]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.25]; R_DKIM_ALLOW(-0.20)[skunkwerks.at:s=fm2,messagingengine.com:s=fm1]; MIME_GOOD(-0.10)[text/plain]; RWL_MAILSPIKE_GOOD(-0.10)[66.111.4.25:from]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.25:from]; XM_UA_NO_VERSION(0.01)[]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; DMARC_NA(0.00)[skunkwerks.at]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEFALL_USER(0.00)[dch]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[skunkwerks.at:+,messagingengine.com:+]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org] X-Rspamd-Queue-Id: 4NPj1t29PNz3FmV X-Spamd-Bar: ---- X-ThisMailContainsUnwantedMimeParts: N On Sat, 3 Dec 2022, at 18:15, Nuno Teixeira wrote: > Really nice. > > I'm thinking on 3 trees for ports: > > - main (push) > - 2022Qn (cherry-pick, push) > - test (push to main when testing done) > > $ git clone https://git.freebsd.org/ports ports/main > $ cd ports/main > $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 > $ git worktree add ../test -b main origin/main > > My question is how do I push a commit from 'test' to 'main'? > > This sugestion is because I can have several ports in testing fase on > 'test' branch and choose a specific commit to push to 'main' (local > branch) and then do a final push. this would be similar to my setup, too. I have 3+ branches, as separate worktrees. - main -> dch/main - upstream -> freebsd-ports/main - quarterly -> freebsd-ports/2022Q4 or whatever my workflow is roughly as follows: ## do stuff, rebase it on upstream $ cd /usr/ports (now in dch/main) $ hack hack hack, git commit stuff on a pile of other crufty commits $ git fetch upstream/main && git branch --force upstream upstream/main $ git rebase --ignore-date --interactive upstream/main $ run some poudrieres, mmmm so good ## pull these over to upstream and push $ cd ~/ports/upstream $ git cherry-pick main main~1 main~2 $ git push -u upstream HEAD:main ## woops we should MFH these to quarterly $ cd ~/ports/quarterly $ git fetch upstream 2022Q4 && git reset --hard upstream/2022Q4 $ git cherry-pick -x main main~1 main~2 $ git push -u quarterly HEAD:main I think I got that more or less correct, it's a little confusing where all the different mains point to initially. Periodically, I need to adjust in .git/config where my "quarterly" points to, then the git reset again just works. A+ Dave From nobody Sun Dec 4 01:50:00 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPqPR6jKJz4k2lX for ; Sun, 4 Dec 2022 01:50:03 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [IPv6:2001:470:1:117::25]) (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 "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPqPR4Pb1z3wlj; Sun, 4 Dec 2022 01:50:03 +0000 (UTC) (envelope-from delphij@delphij.net) Authentication-Results: mx1.freebsd.org; none Received: from odin.corp.delphij.net (unknown [IPv6:2001:470:48ca:5:c85f:30e6:be8a:bedb]) by anubis.delphij.net (Postfix) with ESMTPSA id 17C9A3116C; Sat, 3 Dec 2022 17:50:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=m7e2; t=1670118602; x=1670133002; bh=88GPJuAj8zWW7egRg8niJLtPW2OhKCi2JAtoH6ui+/A=; h=Date:Reply-To:To:Cc:References:From:Subject:In-Reply-To; b=GBkkhSHgjzKqUu0+d0KMSigbMa42Zv/6z6Iqa1ar1RvBfYWSPFwFx6sZ18m7cvYfn iPTZg+WAjrWbCZn7+61srKJqWDnTd7jhsqqRqU08FOEoj6wnLRPiDvClIycBocxKr0 Y5s8bdQrJad/i7g9qVNeYthcyF7wmUXRhCdGEoPOFPRFcDmMvDrUkgmzAOnd7VrpUr Oms1DotsUQ0Awim2tWHDPPKWiUf7PpYYIUyqndwoZ6fZ1ssSUNj2Uf6lHvbft59DIN TiynntNAsBYjE+cOOOvpmQBNAvgFiuF/uTT3Ns3AXIEDMpn2BN2r4eZzB+FoJVhVVj HXqon7t5DNG9Q== Message-ID: <303e6bdd-6a9d-ff92-023b-f4f5093797c0@delphij.net> Date: Sat, 3 Dec 2022 17:50:00 -0800 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Thunderbird Reply-To: d@delphij.net Content-Language: en-US To: Nuno Teixeira , Warner Losh Cc: d@delphij.net, freebsd-git@freebsd.org References: From: Xin Li Subject: Re: git-switch(1) then git-pull(1) In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4NPqPR4Pb1z3wlj X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 2022-12-03 10:15 AM, Nuno Teixeira wrote: > Really nice. > > I'm thinking on 3 trees for ports: > > - main (push) > - 2022Qn (cherry-pick, push) > - test (push to main when testing done) > > $ git clone https://git.freebsd.org/ports > ports/main > $ cd ports/main > $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 > $ git worktree add ../test -b main origin/main The third step would fail, because you have checked out main on ports/main. You would want to do this instead: $ git worktree add ../test -b test origin/main > My question is how do I push a commit from 'test' to 'main'? You can do: $ git push origin test:main -n (which will tell the SHA1s and you can inspect with git log; remove -n once satisfactory, or git pull --rebase as needed) > This sugestion is because I can have several ports in testing fase on > 'test' branch and choose a specific commit to push to 'main' (local > branch) and then do a final push. In this case I'd create multiple branches (to the extent that changes can be isolated in a self-containing manner), and have one branch for testing. So the setup would roughly be: you have B1, B2, B3 working on 3 different stuff which almost don't touch each other. Conceptually, you can consider origin/main as a working branch used by someone else, too. Now you want to test the stuff, e.g. with poudriere, or some integrated test of src/, you would create a new branch T for that, like: (first time) $ git worktree add ../testspace -b test origin/main $ cd ../testspace (blow away everything and reset to a known vanilla state) $ cd ../testspace $ git reset --hard origin/main # Reset branch to origin/main Then: $ git merge B1 $ git merge B2 $ git merge B3 Now you have all your work merged into the test space, do whatever tests you want. When the result is satisfactory, perform a 'git rebase origin/main' and squash commits if needed. Assuming you saw some changes would be needed for B2, you would make the changes in B2's worktree, and redo the merge in 'testspace' with: $ git merge B2 Or let's say origin/main moved, you can do: $ git fetch origin $ git merge origin/main and continue to work. If for whatever reason you feel B2 is not yet ready for prime time, do a reset and merge just B1 and B3: $ cd ../testspace $ git reset --hard origin/main # Reset branch to origin/main $ git merge B1 $ git merge B3 Finally: $ git rebase origin/main then T would be what you would be pushing. The benefit of this approach is that you don't really need to rebase often on your work branch (they will make the history harder to understand) and you got to choose when to do that, or just omit one branch at push time, etc., so it's very flexible when working on something really big. The downside is slightly more 'git merge' work: usually they can be done automatically by git, however. > > Does this makes sense? > > > > > > > Warner Losh > escreveu no dia > sábado, 3/12/2022 à(s) 16:16: > > > > On Sat, Dec 3, 2022 at 8:59 AM Nuno Teixeira > wrote: > > Hello, > > $ git clone https://git.freebsd.org/ports > ports/main > $ cd ports/main > $ git worktree add ../2022Q4 -b 2022Q4 origin/2022Q4 > > > So we will have ports/{main,2022Q4} and cd to main or 2022Q4 > according if commit is to main or quarterly? > > I will try this soon because swithing from branches is not the > best way (but I used it for about 1 year without problems). > > > I do this for my src commits. I have 3 trees: 'head', 'stable-13' > and 'stable-12'. I have a lot of branches off of head > for work in progress that I switch between all the time to refine, > finish  and land them. For especially large projects > I'll have a separate work tree, but usually the changes are small > enough that this works fine. I have a script that > rebases everything once and a while to keep my branches in sync. For > stable-12 I have a stable/12 branch locally > that mirrors upstream. I also have a stable/mfc12 branche that I > 'insta-MFC' changes that I commit to head that need > time to cook before being pushed. I do this so I don't lose things. > I then rebase the stable/mfc12 onto stable/12 and push > when the time comes (doing the rebase dance as needed). > > Warner > > > > -- > Nuno Teixeira > FreeBSD Committer (ports) From nobody Mon Jan 9 02:31:26 2023 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nqycr441Lz2pNQr for ; Mon, 9 Jan 2023 02:31:40 +0000 (UTC) (envelope-from gshapiro@freebsd.org) Received: from zim.gshapiro.net (zim.gshapiro.net [IPv6:2001:bc8:2e97:100::100]) (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.gshapiro.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nqycq5lkRz42Kc for ; Mon, 9 Jan 2023 02:31:39 +0000 (UTC) (envelope-from gshapiro@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 2001:bc8:2e97:100::100 is neither permitted nor denied by domain of gshapiro@freebsd.org) smtp.mailfrom=gshapiro@freebsd.org; dmarc=none Received: from thornystick.local ([IPv6:2601:647:5d00:1ac0:f02f:286e:4a6:5c9b]) (authenticated bits=0) by zim.gshapiro.net (8.17.0.4/8.17.0.4) with ESMTPSA id 3092VR8g088772 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 9 Jan 2023 02:31:29 GMT Date: Sun, 8 Jan 2023 18:31:26 -0800 From: Gregory Shapiro To: freebsd-git@freebsd.org Subject: Vendor import push failed: src refspec ... does not match any Message-ID: <20230109023126.kjjynari5b6jpqxo@thornystick.local> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spamd-Result: default: False [-3.04 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.94)[-0.943]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; ASN(0.00)[asn:12876, ipnet:2001:bc8::/32, country:FR]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; R_SPF_SOFTFAIL(0.00)[~all:c]; FREEFALL_USER(0.00)[gshapiro]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_NONE(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DOM_EQ_FROM_DOM(0.00)[] X-Rspamd-Queue-Id: 4Nqycq5lkRz42Kc X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N I'm doing my first vendor import since the move to git. Following the instructions in section 5.4 of committers-guide/#git-primer, I hit a roadblock trying to push the new version to the vendor branch. My actions are below, including the failure to push at the end. What should have I have done differently? > cd src/freebsd/main > git remote -v freebsd https://git.freebsd.org/src.git (fetch) freebsd git@gitrepo.freebsd.org:src.git (push) > git pull Already up to date. > git status On branch main Your branch is up to date with 'freebsd/main'. nothing to commit, working tree clean > git worktree add ../vendor/sendmail freebsd/vendor/sendmail Preparing worktree (detached HEAD 0694dcb04b81) HEAD is now at 0694dcb04b81 Bring in fix from upstream that allows libsm to compile against FreeBSD 13 > cd ../vendor/sendmail > rsync --archive --delete --exclude=.git ~/Work/fb/sendmail-8.17.1/ ./ > git add -A > ... (checked git status, git diff, all looked good at first, though after the error, I see that git status reports, "Not currently on any branch.") ... > git commit -m "Vendor import of sendmail 8.17.1" [detached HEAD e2db8b1cc34e] Vendor import of sendmail 8.17.1 188 files changed, 13741 insertions(+), 8635 deletions(-) create mode 100644 cf/feature/check_other.m4 create mode 100644 cf/feature/sts.m4 mode change 100644 => 100755 contrib/doublebounce.pl mode change 100644 => 100755 contrib/link_hash.sh mode change 100644 => 100755 contrib/re-mqueue.pl create mode 100644 devtools/OS/Darwin.19.x create mode 100644 devtools/OS/Darwin.20.x create mode 100644 include/sm/ixlen.h create mode 100644 libsm/ilenx.c create mode 100644 libsm/lowercase.c create mode 100644 libsm/strcaseeq.c create mode 100644 libsm/t-ixlen.c create mode 100755 libsm/t-ixlen.sh create mode 100644 libsm/t-str2prt.c create mode 100644 libsm/t-streq.c create mode 100755 libsm/t-streq.sh create mode 100644 libsm/utf8_valid.c create mode 100644 libsm/uxtext_unquote.c create mode 100644 libsm/xleni.c create mode 100755 libsmutil/t-lockfile-0.sh create mode 100644 libsmutil/t-lockfile.c create mode 100755 libsmutil/t-maplock-0.sh > git tag -a -m "Tag sendmail 8.17.1" vendor/sendmail/8.17.1 > git push --dry-run --follow-tags freebsd vendor/sendmail error: src refspec vendor/sendmail does not match any error: failed to push some refs to 'gitrepo.freebsd.org:src.git' Note that the output to git commit above starts with "[detached HEAD ...]" which, along with the git status issue described above, looks suspicious. From nobody Mon Jan 9 06:16:57 2023 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nr3cs0PCFz2r71Z for ; Mon, 9 Jan 2023 06:17:01 +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 4Nr3cr7473z4GvR; Mon, 9 Jan 2023 06:17:00 +0000 (UTC) (envelope-from philip@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673245021; 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=3jeg7SN4CkJGEU8CsEiVpB1qDrEVqqvYLU+Ji0tBx+w=; b=fhSQ0+hfWyNgIDWI0YhEUYmd1/GDqHR7tIvsoNxOszvMUqSBBuLOrlsvYg1iLRRbHDBaxC E/FiitJiAHnFM4EAZXzFI6F/Q7ctzVFRlAZ0rb2Jta7z/OId1DQiVOfva88NR73+IzDkbQ Zckrd8Y4d2idf6VXVZh4GnjIoxV26fCBLBsZqbFE8O+Tct0pwmsOlQMv2n0WOBmd0cd52I YesV4WtzmMdwsYv55MwBIhkOluKJDSFMbrNuEZLKQXHPCFv4kkC5Xs/tOXjtJIMS41EzN5 LelQih7tK2P+He+SUJac3xk9joZqSDnKkr31iEz6Cg28PDuYbbeMFFYPcWnEyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673245021; 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=3jeg7SN4CkJGEU8CsEiVpB1qDrEVqqvYLU+Ji0tBx+w=; b=wULVIFM7TLoilIXmZJnOGvJiF+k9qx0dk8D0VoB7099t7ckHrYcRqq905TL0dvdRATuqf4 hOWzUdInRZhCn5hl3VWclk5DKY/Cre5W0PaFjNnTCR1LNvCqUNiUHXV+YV58U9dk9PZY8s ZgI1FZauQWPBvAiF7pw5nMoCQXYqX4EIq+2sJK+1H6+bg76H4jyTzdn8ijK4EqmL06xQMq n0ed0FFfjmwcP23weB8mjN/YZTyKZMG67jPPkUGFCtWLgxPz0hguhngHOg05LuQ7FHVrBd 4LeDtV+mJ78/LuCdajNij5f/jq9GKJw3HVJBdizshV1pwyVksTkGwUwO2qnL1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673245021; a=rsa-sha256; cv=none; b=N3w4tLEa7HMhVDq9DjNYd4XBFq8iaz2JOCsEnl5b2T+L/SHk0MYKGAeCaN+Aobcr+pwXzp OGmN+WQo/op49x0bbzuo/9YhdVGXSMnlDSWyhgLGqZEsG0M1llvkVmwVCf51bslknMQNOb IZEy68TArlpF/8h0ousnfcrBE+jdpnuD52+picf6U7bYHDkwH72b5AlOEZqmKSqwaaAZ/2 35F0YBBeUCIMaHNG7YeFHmISmkT1pc40uQ/0NUwUZnqFiy3S/6KKWww16qCFeZOrJ9U+Bi IB/5Q4LaIrgCV2E0kI2vRGwWAiQtLTjs2EieGkrZx5AwrDiAN3Cz8xoy+LqEVw== Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (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 did not present a certificate) (Authenticated sender: philip/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Nr3cr5tlczMMj; Mon, 9 Jan 2023 06:17:00 +0000 (UTC) (envelope-from philip@freebsd.org) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailauth.nyi.internal (Postfix) with ESMTP id 3655127C0054; Mon, 9 Jan 2023 01:17:00 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 09 Jan 2023 01:17:00 -0500 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrkeehgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffoffkjghfgggtsehttdhmtdertddtnecuhfhrohhmpefrhhhilhhi phcurfgrvghpshcuoehphhhilhhiphesfhhrvggvsghsugdrohhrgheqnecuggftrfgrth htvghrnhepvdehheekgffhieetheetudduuefhvdegtedtiefhffelueetgeegtedutddt udefnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomhepphhhihhlihhpodhmvghsmhhtphgruhht hhhpvghrshhonhgrlhhithihqdduudeiiedviedvgeekqddvfeehudektddtkedqphhhih hlihhppeepfhhrvggvsghsugdrohhrghesthhrohhusghlvgdrihhs X-ME-Proxy: Feedback-ID: ia691475d:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Jan 2023 01:16:59 -0500 (EST) From: Philip Paeps To: Gregory Shapiro Cc: freebsd-git@freebsd.org Subject: Re: Vendor import push failed: src refspec ... does not match any Date: Mon, 09 Jan 2023 14:16:57 +0800 X-Mailer: MailMate (1.14r5933) Message-ID: In-Reply-To: <20230109023126.kjjynari5b6jpqxo@thornystick.local> References: <20230109023126.kjjynari5b6jpqxo@thornystick.local> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-ThisMailContainsUnwantedMimeParts: N On 2023-01-09 10:31:26 (+0800), Gregory Shapiro wrote: > I'm doing my first vendor import since the move to git. Following the > instructions in section 5.4 of committers-guide/#git-primer, I hit a > roadblock trying to push the new version to the vendor branch. My > actions are below, including the failure to push at the end. What > should have I have done differently? > > >> cd src/freebsd/main >> git remote -v > freebsd https://git.freebsd.org/src.git (fetch) > freebsd git@gitrepo.freebsd.org:src.git (push) >> git pull > Already up to date. >> git status > On branch main > Your branch is up to date with 'freebsd/main'. > > nothing to commit, working tree clean >> git worktree add ../vendor/sendmail freebsd/vendor/sendmail > Preparing worktree (detached HEAD 0694dcb04b81) > HEAD is now at 0694dcb04b81 Bring in fix from upstream that allows > libsm to compile against FreeBSD 13 >> cd ../vendor/sendmail >> rsync --archive --delete --exclude=.git ~/Work/fb/sendmail-8.17.1/ ./ >> git add -A >> > ... > (checked git status, git diff, all looked good at first, though after > the error, I see that git status reports, "Not currently on any > branch.") > ... >> git commit -m "Vendor import of sendmail 8.17.1" > [detached HEAD e2db8b1cc34e] Vendor import of sendmail 8.17.1 > 188 files changed, 13741 insertions(+), 8635 deletions(-) > create mode 100644 cf/feature/check_other.m4 > create mode 100644 cf/feature/sts.m4 > mode change 100644 => 100755 contrib/doublebounce.pl > mode change 100644 => 100755 contrib/link_hash.sh > mode change 100644 => 100755 contrib/re-mqueue.pl > create mode 100644 devtools/OS/Darwin.19.x > create mode 100644 devtools/OS/Darwin.20.x > create mode 100644 include/sm/ixlen.h > create mode 100644 libsm/ilenx.c > create mode 100644 libsm/lowercase.c > create mode 100644 libsm/strcaseeq.c > create mode 100644 libsm/t-ixlen.c > create mode 100755 libsm/t-ixlen.sh > create mode 100644 libsm/t-str2prt.c > create mode 100644 libsm/t-streq.c > create mode 100755 libsm/t-streq.sh > create mode 100644 libsm/utf8_valid.c > create mode 100644 libsm/uxtext_unquote.c > create mode 100644 libsm/xleni.c > create mode 100755 libsmutil/t-lockfile-0.sh > create mode 100644 libsmutil/t-lockfile.c > create mode 100755 libsmutil/t-maplock-0.sh >> git tag -a -m "Tag sendmail 8.17.1" vendor/sendmail/8.17.1 >> git push --dry-run --follow-tags freebsd vendor/sendmail > error: src refspec vendor/sendmail does not match any > error: failed to push some refs to 'gitrepo.freebsd.org:src.git' > > Note that the output to git commit above starts with "[detached HEAD > ...]" which, along with the git status issue described above, looks > suspicious. You should create a branch in your worktree. This will probably do what you want: git checkout -b vendor/sendmail I believe this will put the HEAD of that branch on the commit you made, but this is untested. git reset e2db8b1cc34e If that doesn't work, simply do the rsync; git add; git commit again. It's not worth fighting with git over. :) Philip -- Philip Paeps Senior Reality Engineer Alternative Enterprises From nobody Mon Jan 9 06:31:31 2023 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Nr3xj08l0z2r8lh for ; Mon, 9 Jan 2023 06:31:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (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 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nr3xh6sbsz4Hxg for ; Mon, 9 Jan 2023 06:31:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x634.google.com with SMTP id ss4so10309883ejb.11 for ; Sun, 08 Jan 2023 22:31:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=2ns/c2bdBUMeM6D5cf0TN82QccaB/zypvH+u7nwe/xI=; b=S7Jaf3jz7GQaxTWc8qME2VgGvHHPLTkrSC27M9dPciRw8tEO9CBUYLctVt+z9Fl22d BlCUF9j2FNxwMkpJJqFQVVRxEIPxg3QrD+8H1xVIqZF3/sO52Qtglble/9QFIGbLCjcO 6AZkyK9Olv9d+qG75PIdzC+ZOe6vm+7EJ+yLQbRdAHWi45gtKi5OChArpxJq0G49F+Kw WfYypkPyUmO00nPQ39z0UYg+qLvjFL8GrWYKqktwtpSqmW/troLef3aK4kAWvE8m3Hcm jFp5ubyUcrchTVrpdT46LXOh+E8FqEDEfw3TP6YBS+gSY5CfW5Rdef5uTJdkA6X3hix/ kkEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2ns/c2bdBUMeM6D5cf0TN82QccaB/zypvH+u7nwe/xI=; b=6Lb85OXK6C/DiK11Uos14ZLNutuK4pRrk2X+7Kx0vHs6KB4f2gditSmZWA3cpYYGai 5yxtDkNGKGHA3tLJaDiM2vfeiBP2IJJJ3vz9jxhfgBOSTmJgsUDt1j0Z2USpbhsCMfa/ StvFgs4L4mrPc8Vog1V4RpyfmePjPElkVze2DxOeaNeHbxoQ9xSjPmGof/qXG81t84Lh kGXumEcCs29EUvo26LYDVERYnTQOnnHSa2hWgA1VcfrBOgxAgbHIcnAdodKHHf/FFJzE sfO2hCPE5eC1oMJ9jMwdrjJkEQTSNDLlhn4R+rdlMa3GyPOVfSOi9OcsahN65PW/PLy3 ns3w== X-Gm-Message-State: AFqh2kpsudhEKv4B+0Xs6hnRt62G983MIXiPxcm4/Kr1a4/fMOlu8hFB g3xZwfX4F9SR5VQTMBhMOL4m0SYcYak2xWi2s+wEF4w6oDkf3hRF X-Google-Smtp-Source: AMrXdXtXxgJZVAPbuStjV+z763bFzsZ2+Q19t9kdcVruYWKoZThqXOGc6DyS54l9us5NQfhPgUbalbAWN8hJsiAoDqQ= X-Received: by 2002:a17:906:140e:b0:7c0:e0db:f136 with SMTP id p14-20020a170906140e00b007c0e0dbf136mr4842987ejc.333.1673245895912; Sun, 08 Jan 2023 22:31:35 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <20230109023126.kjjynari5b6jpqxo@thornystick.local> In-Reply-To: From: Warner Losh Date: Sun, 8 Jan 2023 23:31:31 -0700 Message-ID: Subject: Re: Vendor import push failed: src refspec ... does not match any To: Philip Paeps Cc: Gregory Shapiro , freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000003f80eb05f1ceeb30" X-Rspamd-Queue-Id: 4Nr3xh6sbsz4Hxg X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --0000000000003f80eb05f1ceeb30 Content-Type: text/plain; charset="UTF-8" On Sun, Jan 8, 2023 at 11:17 PM Philip Paeps wrote: > On 2023-01-09 10:31:26 (+0800), Gregory Shapiro wrote: > > > I'm doing my first vendor import since the move to git. Following the > > instructions in section 5.4 of committers-guide/#git-primer, I hit a > > roadblock trying to push the new version to the vendor branch. My > > actions are below, including the failure to push at the end. What > > should have I have done differently? > > > > > >> cd src/freebsd/main > >> git remote -v > > freebsd https://git.freebsd.org/src.git (fetch) > > freebsd git@gitrepo.freebsd.org:src.git (push) > >> git pull > > Already up to date. > >> git status > > On branch main > > Your branch is up to date with 'freebsd/main'. > > > > nothing to commit, working tree clean > >> git worktree add ../vendor/sendmail freebsd/vendor/sendmail > You needed to add '-b vendor/sendmail' here for it to create a branch in your local name space (not in the freebsd/* upstream namespace). > > Preparing worktree (detached HEAD 0694dcb04b81) > > HEAD is now at 0694dcb04b81 Bring in fix from upstream that allows > > libsm to compile against FreeBSD 13 > >> cd ../vendor/sendmail > >> rsync --archive --delete --exclude=.git ~/Work/fb/sendmail-8.17.1/ ./ > >> git add -A > >> > > ... > > (checked git status, git diff, all looked good at first, though after > > the error, I see that git status reports, "Not currently on any > > branch.") > Yea, the -b was missing above, I think. > > ... > >> git commit -m "Vendor import of sendmail 8.17.1" > > [detached HEAD e2db8b1cc34e] Vendor import of sendmail 8.17.1 > > 188 files changed, 13741 insertions(+), 8635 deletions(-) > > create mode 100644 cf/feature/check_other.m4 > > create mode 100644 cf/feature/sts.m4 > > mode change 100644 => 100755 contrib/doublebounce.pl > > mode change 100644 => 100755 contrib/link_hash.sh > > mode change 100644 => 100755 contrib/re-mqueue.pl > > create mode 100644 devtools/OS/Darwin.19.x > > create mode 100644 devtools/OS/Darwin.20.x > > create mode 100644 include/sm/ixlen.h > > create mode 100644 libsm/ilenx.c > > create mode 100644 libsm/lowercase.c > > create mode 100644 libsm/strcaseeq.c > > create mode 100644 libsm/t-ixlen.c > > create mode 100755 libsm/t-ixlen.sh > > create mode 100644 libsm/t-str2prt.c > > create mode 100644 libsm/t-streq.c > > create mode 100755 libsm/t-streq.sh > > create mode 100644 libsm/utf8_valid.c > > create mode 100644 libsm/uxtext_unquote.c > > create mode 100644 libsm/xleni.c > > create mode 100755 libsmutil/t-lockfile-0.sh > > create mode 100644 libsmutil/t-lockfile.c > > create mode 100755 libsmutil/t-maplock-0.sh > >> git tag -a -m "Tag sendmail 8.17.1" vendor/sendmail/8.17.1 > >> git push --dry-run --follow-tags freebsd vendor/sendmail > > error: src refspec vendor/sendmail does not match any > > error: failed to push some refs to 'gitrepo.freebsd.org:src.git' > Yes. You've not created a vendor/sendmail branch yet, so there's no 'ref' to push. This message really is git saying 'I'm not sure I know what vendor/sendmail is', since it uses that to know what to push upstream. This is where having the upstream set correctly just might matter. If you look in your config file, you should see something like: > > > > Note that the output to git commit above starts with "[detached HEAD > > ...]" which, along with the git status issue described above, looks > > suspicious. > > You should create a branch in your worktree. This will probably do what > you want: > > git checkout -b vendor/sendmail > It's better done with the above -b command so that the 'upstream' is set right (though this might not be one of the times that matters). > I believe this will put the HEAD of that branch on the commit you made, > but this is untested. > I think it will, but it won't have the upstream as freebsd/vendor/sendfile which would be a problem if anybody else ever committed to that vendor branch (or he did on a different machine). [branch "vendor/sendmail"] remote = freebsd merge = refs/heads/vendor/sendmail in the .git/config file from the repo (I hacked that together off a machine I think has the right entries) git reset e2db8b1cc34e > > If that doesn't work, simply do the rsync; git add; git commit again. > It's not worth fighting with git over. :) > Yea, git makes it stupidly easy to throw away work that's somehow done incorrectly the first time... --0000000000003f80eb05f1ceeb30 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sun, Jan 8, 2023 at 11:17 PM Phili= p Paeps <philip@freebsd.org>= ; wrote:
On 2023= -01-09 10:31:26 (+0800), Gregory Shapiro wrote:

> I'm doing my first vendor import since the move to git.=C2=A0 Foll= owing the
> instructions in section 5.4 of committers-guide/#git-primer, I hit a > roadblock trying to push the new version to the vendor branch.=C2=A0 M= y
> actions are below, including the failure to push at the end.=C2=A0 Wha= t
> should have I have done differently?
>
>
>> cd src/freebsd/main
>> git remote -v
> freebsd https://git.freebsd.org/src.git (fetch)
> freebsd git@gitrepo.freebsd.org:src.git (push)
>> git pull
> Already up to date.
>> git status
> On branch main
> Your branch is up to date with 'freebsd/main'.
>
> nothing to commit, working tree clean
>> git worktree add ../vendor/sendmail freebsd/vendor/sendmail

You needed to add '-b vendor/sendmail'= ; here for it to create a branch in your local name space (not in the freeb= sd/* upstream namespace).
=C2=A0
> Preparing worktree (detached HEAD 0694dcb04b81)
> HEAD is now at 0694dcb04b81 Bring in fix from upstream that allows > libsm to compile against FreeBSD 13
>> cd ../vendor/sendmail
>> rsync --archive --delete --exclude=3D.git ~/Work/fb/sendmail-8.17.= 1/ ./
>> git add -A
>>
> ...
> (checked git status, git diff, all looked good at first, though after<= br> >=C2=A0 the error, I see that git status reports, "Not currently on= any
>=C2=A0 branch.")

Yea, the -b w= as missing above, I think.
=C2=A0
> ...
>> git commit -m "Vendor import of sendmail 8.17.1"
> [detached HEAD e2db8b1cc34e] Vendor import of sendmail 8.17.1
>=C2=A0 188 files changed, 13741 insertions(+), 8635 deletions(-)
>=C2=A0 create mode 100644 cf/feature/check_other.m4
>=C2=A0 create mode 100644 cf/feature/sts.m4
>=C2=A0 mode change 100644 =3D> 100755 contrib/doublebounce.pl
>=C2=A0 mode change 100644 =3D> 100755 contrib/link_hash.sh
>=C2=A0 mode change 100644 =3D> 100755 contrib/re-mqueue.pl
>=C2=A0 create mode 100644 devtools/OS/Darwin.19.x
>=C2=A0 create mode 100644 devtools/OS/Darwin.20.x
>=C2=A0 create mode 100644 include/sm/ixlen.h
>=C2=A0 create mode 100644 libsm/ilenx.c
>=C2=A0 create mode 100644 libsm/lowercase.c
>=C2=A0 create mode 100644 libsm/strcaseeq.c
>=C2=A0 create mode 100644 libsm/t-ixlen.c
>=C2=A0 create mode 100755 libsm/t-ixlen.sh
>=C2=A0 create mode 100644 libsm/t-str2prt.c
>=C2=A0 create mode 100644 libsm/t-streq.c
>=C2=A0 create mode 100755 libsm/t-streq.sh
>=C2=A0 create mode 100644 libsm/utf8_valid.c
>=C2=A0 create mode 100644 libsm/uxtext_unquote.c
>=C2=A0 create mode 100644 libsm/xleni.c
>=C2=A0 create mode 100755 libsmutil/t-lockfile-0.sh
>=C2=A0 create mode 100644 libsmutil/t-lockfile.c
>=C2=A0 create mode 100755 libsmutil/t-maplock-0.sh
>> git tag -a -m "Tag sendmail 8.17.1" vendor/sendmail/8.17= .1
>> git push --dry-run --follow-tags freebsd vendor/sendmail
> error: src refspec vendor/sendmail does not match any
> error: failed to push some refs to 'gitrepo.freebsd.org:src.git= 9;

Yes. You've not created a vendor= /sendmail branch yet, so there's no 'ref' to push. This message= really is git saying 'I'm not sure I know what vendor/sendmail is&= #39;, since it uses that to know what to push upstream. This is where havin= g the upstream set correctly just might matter.

If= you look in your config file, you should see something like:
=C2=A0
>
> Note that the output to git commit above starts with "[detached H= EAD
> ...]" which, along with the git status issue described above, loo= ks
> suspicious.

You should create a branch in your worktree.=C2=A0 This will probably do wh= at
you want:

git checkout -b vendor/sendmail

It'= s better done with the above -b command so that the 'upstream' is s= et right (though this might not be one of the times that matters).
=C2=A0
I believe this will put the HEAD of that branch on the commit you made, but this is untested.

I think it will, = but it won't have the upstream as freebsd/vendor/sendfile which would b= e a problem if anybody else ever committed to that vendor branch (or he did= on a different machine).

[branch "vendor/sen= dmail"]
=C2=A0 =C2=A0 =C2=A0 =C2=A0 remote =3D freebsd
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 merge =3D refs/heads/vendor/sendmail

in the .git/config file from the repo (I hacked that together off a= machine I think has the right entries)

git reset e2db8b1cc34e

If that doesn't work, simply do the rsync; git add; git commit again.= =C2=A0
It's not worth fighting with git over. :)

Yea, git makes it stupidly easy to throw away work that's someho= w done incorrectly the first time...=C2=A0
--0000000000003f80eb05f1ceeb30-- From nobody Mon Jan 9 19:14:35 2023 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NrNtH1mpHz2pKkq for ; Mon, 9 Jan 2023 19:14:47 +0000 (UTC) (envelope-from gshapiro@freebsd.org) Received: from zim.gshapiro.net (zim.gshapiro.net [IPv6:2001:bc8:2e97:100::100]) (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.gshapiro.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NrNtG3ntwz4QN1; Mon, 9 Jan 2023 19:14:46 +0000 (UTC) (envelope-from gshapiro@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from C02Y1186JHD2.corp.proofpoint.com ([208.86.202.9]) (authenticated bits=0) by zim.gshapiro.net (8.17.0.4/8.17.0.4) with ESMTPSA id 309JEaWo095424 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 9 Jan 2023 19:14:41 GMT Date: Mon, 9 Jan 2023 11:14:35 -0800 From: Gregory Shapiro To: Warner Losh Cc: Philip Paeps , freebsd-git@freebsd.org Subject: Re: Vendor import push failed: src refspec ... does not match any Message-ID: <20230109191435.jdod56db5ewpxajm@C02Y1186JHD2.corp.proofpoint.com> References: <20230109023126.kjjynari5b6jpqxo@thornystick.local> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 4NrNtG3ntwz4QN1 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:12876, ipnet:2001:bc8::/32, country:FR] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Thanks for the responses. Some followup: > >> git worktree add ../vendor/sendmail freebsd/vendor/sendmail > > You needed to add '-b vendor/sendmail' here for it to create a branch > in your local name space (not in the freebsd/* upstream namespace). Does the documentation at: https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git Need to be updated? Specifically, section 5.4 never talks about including a '-b' flag in the git worktree command. '-b' is mentioned for creating a new vendor branch but sendmail as a vendor is not new and the branch is already listed as existing: https://cgit.freebsd.org/src/log/?h=vendor/sendmail > Yes. You've not created a vendor/sendmail branch yet, so there's no > 'ref' to push. This message really is git saying 'I'm not sure I know > what vendor/sendmail is', since it uses that to know what to push > upstream. This is where having the upstream set correctly just might > matter. I'll note this is not the first vendor import of sendmail source so I want to make sure not to break anything by creating a new branch for a pre-existing vendor package. > Yea, git makes it stupidly easy to throw away work that's somehow done > incorrectly the first time... Happy to restart once I am sure I won't break the existing vendor import of sendmail. From nobody Wed Jan 11 06:17:13 2023 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NsHXY3pYCz2pBby for ; Wed, 11 Jan 2023 06:17:33 +0000 (UTC) (envelope-from idefix@fechner.net) Received: from anny.lostinspace.de (anny.lostinspace.de [195.30.95.33]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4NsHXX5tqbz49M3 for ; Wed, 11 Jan 2023 06:17:32 +0000 (UTC) (envelope-from idefix@fechner.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=fechner.net header.s=default header.b=Y1LijLH5; spf=pass (mx1.freebsd.org: domain of idefix@fechner.net designates 195.30.95.33 as permitted sender) smtp.mailfrom=idefix@fechner.net; dmarc=pass (policy=none) header.from=fechner.net Received: from server2.idefix.lan (beta.fechner.net [89.58.45.13]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: idefix@fechner.net) by anny.lostinspace.de (Postfix) with ESMTPSA id 177B797434 for ; Wed, 11 Jan 2023 07:17:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fechner.net; s=default; t=1673417851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nVrpGGJyC5XFn3mL+6Vl3F4s0p1OO+aILGJLttCNchw=; b=Y1LijLH5Fdh7NPWhS/fO7TzSbGXi8Np1OW4Gn+zAwSMvriAlurJ7CcHI8Yrw5WANDGRZ5l ZdalgYP4qaIrGqoYptJBK6hCGHITgNb6FOyUaeX0u7MXpq8OJhrC+ipl+3XqBvJyPYyaKF 6c1NaTsmLze8NmhQv6SXLhnmWHI5iDs= Received: from [192.168.0.151] (unknown [93.182.105.120]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (P-256)) (No client certificate requested) by server2.idefix.lan (Postfix) with ESMTPSA id 8890A47C48E for ; Wed, 11 Jan 2023 07:17:30 +0100 (CET) Message-ID: <4cef266a-cdd5-29d1-fb83-c6b3d9915cb9@fechner.net> Date: Wed, 11 Jan 2023 08:17:13 +0200 List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 To: freebsd-git@FreeBSD.org Content-Language: en-US From: Matthias Fechner Subject: Cannot fetch FreeBSD ports repository anymore Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: anny.lostinspace.de X-Spamd-Result: default: False [-6.69 / 15.00]; DWL_DNSWL_MED(-2.00)[fechner.net:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.988]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[fechner.net,none]; R_DKIM_ALLOW(-0.20)[fechner.net:s=default]; RCVD_IN_DNSWL_MED(-0.20)[195.30.95.33:from]; R_SPF_ALLOW(-0.20)[+a]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-git@FreeBSD.org]; ASN(0.00)[asn:5539, ipnet:195.30.0.0/16, country:DE]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[fechner.net:+]; RCPT_COUNT_ONE(0.00)[1]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4NsHXX5tqbz49M3 X-Spamd-Bar: ------ X-ThisMailContainsUnwantedMimeParts: N Dear all, if I try to fetch the FreeBSD repository using https I always get: ❯ g fetch -afpt error: RPC failed; HTTP 504 curl 22 The requested URL returned error: 504 fatal: expected 'packfile' The part in the config: [remote "freebsd"]         fetch = +refs/notes/*:refs/notes/*         url = https://git.freebsd.org/ports.git         fetch = +refs/heads/*:refs/remotes/freebsd/*         pushurl = git@gitrepo.freebsd.org:ports.git I think it is maybe related to my pure internet connection. If I switch to ssh it takes some minutes the fetch starts, but it seems to work fine. Is it maybe necessary to adapt here some timeouts to have https fetch working also for slow internet connections? Gruß Matthias -- "Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning." -- Rich Cook From nobody Wed Jan 11 08:04:07 2023 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NsKvm4gB7z2pQfp for ; Wed, 11 Jan 2023 08:04:20 +0000 (UTC) (envelope-from lwhsu@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 4NsKvm2mBcz4J2P for ; Wed, 11 Jan 2023 08:04:20 +0000 (UTC) (envelope-from lwhsu@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673424260; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aYoyJtWM80ScG9jUF+i3MAltEgcEhquG187Hpfq0Ifk=; b=xVLN8EnwxT14PHlFS+SdutT6XMcLt+dHUbePqw1Pv73k/7xiSZjjxU5wsvBldCoOtJNitr sUd0M82iz99nNiu8zDROz5WCAKgDkFWtpZdXX+91kDRNceToXOHk4keQqAvjSnYDOriLM0 BDg7PB4QAHB5fDiPT3UYrWsJgKuDHbHsQPJFrMCe4qbDs6nCG4rdu8jnyFy+oQPFt1rtHy SyZBrSh+JcUVhZbms5gSRFJctcwgdEN0nx0PBrBLz/0dPgZRZ20C50j7VvvZ7U10yL62o3 LhqbmjxLosaLv3EM3z4JxJ/AcqHsCYTCi1euBO81uR4x8bhaduZUhLIZ4q/URw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673424260; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aYoyJtWM80ScG9jUF+i3MAltEgcEhquG187Hpfq0Ifk=; b=sP+T6d5uVG6HCE/ESlleo1kIEHSz4fNgZGO29ovN4Ll/Eb60/eehrRmv/lzfTv1/cqc96D YMGkakK83GD+PBzR/cR+jr7Y+ZhYK72ge9lkVkSVwDcc/L5JtNfkTbizS07qz78+Jbtbtg vSjFWGmZK4eRyxG2Yuw3KwVhxd01S5dUQ2tJpIUaG4E7w/p9Fquda0Ja8ptX4i7cbudJ5j QM1IXN4KUhXZft5onXjNIKSHBKee9mjPEMbJo0ZM/AMXZZSAdkmfNTXG7jQqrweETn1S8S 56l1hE00XJL8SjOxzFlLZ8O4SLYiQ5Iop4vgdMEBGGPm2Vk3tG6v4ZezSAL0IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673424260; a=rsa-sha256; cv=none; b=NgrT/azfhAb/7Wi+WSoJTcFz2BJBShGcZEcSjiPlXVQsiRwWjXKYxKiQFH1FSL99ZTEWW5 tb+ARINzT0VZDg71TQLHS7DZTFU5aG4vkxVXYEzbf+hdeyrZLmptwFsBReAr+2yUY2bZrZ m6w5THojiywy3tBLHa6u8rjrpqhX56d07nFuHvXGb/sHjSXES2kY1ucqSPtHJpEA3nmjqZ vCjPqrTgn1/qnCtCMsv31/SInJfHLOUNfU2zrrVMQohj2cdV0d45VgAH3HhheugpjI2G4b r2+bwex8gtumgOFnj1InUlOY2DFcZyzvjWChoAAzmX7plQHqAC/NSQh9k9m0BQ== Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 1D4" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4NsKvm1ldszLPG for ; Wed, 11 Jan 2023 08:04:20 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-pf1-f172.google.com with SMTP id i65so7336463pfc.0 for ; Wed, 11 Jan 2023 00:04:20 -0800 (PST) X-Gm-Message-State: AFqh2kou/+SEK0fu8avxxn+7C1NZgdXguSpbQaOP6sNJ2bsaQNdZpD6o RvzSWucVXNw0whgl5bNsBm2lUV4+aCW23barFHc= X-Google-Smtp-Source: AMrXdXsX0hx6xqO8sh+jgOUJAQz/smqEZwcCLuYVEmzjWbm20YHu90lFgYK5GsE0xR4UGXLTS6pHN3HQ/oTh1NKP8FA= X-Received: by 2002:a63:f649:0:b0:47c:9590:7230 with SMTP id u9-20020a63f649000000b0047c95907230mr3987834pgj.299.1673424258980; Wed, 11 Jan 2023 00:04:18 -0800 (PST) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 References: <4cef266a-cdd5-29d1-fb83-c6b3d9915cb9@fechner.net> In-Reply-To: <4cef266a-cdd5-29d1-fb83-c6b3d9915cb9@fechner.net> From: Li-Wen Hsu Date: Wed, 11 Jan 2023 16:04:07 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Cannot fetch FreeBSD ports repository anymore To: Matthias Fechner Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On Wed, Jan 11, 2023 at 2:17 PM Matthias Fechner wrote= : > > Dear all, > > if I try to fetch the FreeBSD repository using https I always get: > =E2=9D=AF g fetch -afpt > error: RPC failed; HTTP 504 curl 22 The requested URL returned error: 504 > fatal: expected 'packfile' > > The part in the config: > [remote "freebsd"] > fetch =3D +refs/notes/*:refs/notes/* > url =3D https://git.freebsd.org/ports.git > fetch =3D +refs/heads/*:refs/remotes/freebsd/* > pushurl =3D git@gitrepo.freebsd.org:ports.git > > I think it is maybe related to my pure internet connection. > > If I switch to ssh it takes some minutes the fetch starts, but it seems > to work fine. > Is it maybe necessary to adapt here some timeouts to have https fetch > working also for slow internet connections? This could be a server side issue caused by it took too long to process your request. git.freebsd.org is behind geodns so can you let us know which mirror you were directed to? `drill git.freebsd.org` should work. Best, Li-Wen