public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
	Thomas Lamprecht <t.lamprecht@proxmox.com>,
	PVE development discussion <pve-devel@pve.proxmox.com>
Subject: Re: [pve-devel] Plan for (invasive) shrink of pve-manager git repository
Date: Tue, 30 May 2023 10:36:54 +0200	[thread overview]
Message-ID: <a861fc40-524b-1148-8e1b-62126e76c7c5@proxmox.com> (raw)
In-Reply-To: <2686c33f-a31b-2e3e-1807-fd1640f9ae5b@proxmox.com>

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.




      parent reply	other threads:[~2023-05-30  8:37 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-26  9:45 Thomas Lamprecht
2023-05-28 18:38 ` Thomas Lamprecht
2023-05-28 18:51   ` Thomas Lamprecht
2023-05-30  8:36   ` Fiona Ebner [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=a861fc40-524b-1148-8e1b-62126e76c7c5@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    --cc=pve-devel@pve.proxmox.com \
    --cc=t.lamprecht@proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal