From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (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) by lists.proxmox.com (Postfix) with ESMTPS id BBF999BEBE for ; Tue, 30 May 2023 10:37:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A23C82BE03 for ; Tue, 30 May 2023 10:37:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 30 May 2023 10:37:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0B3EF47ABA for ; Tue, 30 May 2023 10:37:04 +0200 (CEST) Message-ID: Date: Tue, 30 May 2023 10:36:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 To: Proxmox VE development discussion , Thomas Lamprecht , PVE development discussion References: <2686c33f-a31b-2e3e-1807-fd1640f9ae5b@proxmox.com> Content-Language: en-US From: Fiona Ebner In-Reply-To: <2686c33f-a31b-2e3e-1807-fd1640f9ae5b@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.003 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.091 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] Plan for (invasive) shrink of pve-manager git repository X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2023 08:37:05 -0000 Am 28.05.23 um 20:38 schrieb Thomas Lamprecht: > If you fetch in an existing pve-manager.git repository you'll see something like: > From git://git.proxmox.com/git/pve-manager > + f548e4fca...4a8501a8b master -> origin/master (forced update) > + 40ccc11c4...d26a7c43e stable-3 -> origin/stable-3 (forced update) > + 08ba4d2dd...789b4067b stable-4 -> origin/stable-4 (forced update) > + d0ec33c69...b80838a2f stable-5 -> origin/stable-5 (forced update) > + 6ba2c0bcf...b31a318d0 stable-6 -> origin/stable-6 (forced update) > > For re-aligning your local master branch you can do a hard-reset, BUT check > if you got any local commits yet (move them over to another branch with e.g. > `git checkout -b feature-to-re-apply-on-master` > > git checkout master > git reset --hard origin/master > > Then re-create your active development branches freshly from the master > and cherry-pick the relevant patches from the old branch. > > After that you can delete the old branches. > Just a small addendum, because my repository was still pretty large after the above. I had to remove stale remote branches, which can be done with e.g. 'git fetch --all --prune' and I had to run 'git stash clear'. Only then my repository shrunk below 260 MiB. You also might want to check for tags that could still be referencing old stuff.