HEADS UP: git repository cleanup - branch deletion

On this URL you see a list of branches that had no commits for the last 6 months:

http://git.xonotic.org/?p=xonotic/oldstuff.git;a=heads

We will, in a few weeks, delete these branches, but keep them available in this oldstuff.git repository. Nothing will be permanently deleted by this procedure.

In case you want to keep one of these branches, please merge master into it and push. You do this by the following commands in the repository affected:

Code:

git checkout branchname
git fetch origin
# NOTE: in case of the darkplaces repository, you may instead have to merge div0-stable
git merge origin/master
git push -u origin HEAD

Alternatively, you can add any single commit to the branch to "bump" it instead, in case merging master into it is no option.

This branch will then not be deleted.

In case you want an archived branch deleted from oldstuff.git, tell me in PM. This deletion then will be permanent.

In case a branch got deleted once because of inactivity, it can be brought back from the oldstuff.git repository. Commands to do this will be posted here once the first deletion run has been performed.

Once this cleanup has been done, download size for all our git users will be reduced by a few GB.

I have no idea what my branch in that list is for (in maps, mrbougo/nowego-ruined-waypoints). It has waypoint files for ruined but was that map ever in the repo? Heh. nowego, do you remember any of this?

That branch probably can be deleted now. But can just as well also let it slip into the archive.

when will this start happening?

In about two weeks.

When I do it, I will of course also post info how to bring a branch back from the archive.

The cleanup has been performed.

To bring back branch U/B in repository R, do the following while in repository R:

Code:

git checkout -b U/B
git reset --hard origin/master
git pull git://git.xonotic.org/xonotic/oldstuff.git R/U/B
git push -u origin HEAD

In case it does not merge, you can do this to avoid the merging:

Code:

git checkout -b U/B
git reset --hard xonotic-v0.1.0preview
git pull git://git.xonotic.org/xonotic/oldstuff.git R/U/B
# do some change
git commit -a
git push -u origin HEAD

However, this will only work if you actually do a change to your branch! Otherwise, the branch will be up for deletion on the next cleanup run.