GitHub migration procedure
- adrian_broher
- Programmer
- Posts: 1156
- Joined: Fri Mar 01, 2013 9:52 am
- Location: Germany
Re: GitHub migration procedure
Current state of affairs:
I did some research on finding some author data. I could almost map every commit to a real name using public available data. I mapped the emails to the emails published at your github account pages or, if I couldn't find any to the svn uuid.
Also I gave `git repack` a try on the unmodified repository, shrinking it from 815Mb to 506Mb. I wonder what could I gain from removing the /WindowsKit.zip (Windows SDK predecessor for OLD versions, and the blob I mentioned) file from the repository…
I did some research on finding some author data. I could almost map every commit to a real name using public available data. I mapped the emails to the emails published at your github account pages or, if I couldn't find any to the svn uuid.
Also I gave `git repack` a try on the unmodified repository, shrinking it from 815Mb to 506Mb. I wonder what could I gain from removing the /WindowsKit.zip (Windows SDK predecessor for OLD versions, and the blob I mentioned) file from the repository…
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz
- Geoff the Medio
- Programming, Design, Admin
- Posts: 13603
- Joined: Wed Oct 08, 2003 1:33 am
- Location: Munich
Re: GitHub migration procedure
It's up to you. I have essentially no relevant knowledge or experience on this subject and think whatever you prefer to do is probably fine.Vezzra wrote:...once again summon our project lead to make the final decision...
From that description, I think that's probably OK to remove from the history, though I have no memory of it myself.adrian_broher wrote:...removing the /WindowsKit.zip (Windows SDK predecessor for OLD versions...
Re: GitHub migration procedure
You might want to ask Geoff if he intends to keep the "public" email address you can now see on his profile page, because I think it wasn't really his intention to make that email public. He only briefly set it to public to test something, and then set it back to private. It just didn't disappear from his profile page. A solution would be to create another email address, like Dilvish did, e.g. [email protected], add that to his account, set it as the primary, public address, and remove the other one completely. If he considers that, you'd need to use whatever email he decides on for that purpose.adrian_broher wrote:I mapped the emails to the emails published at your github account pages or, if I couldn't find any to the svn uuid.
But maybe he's decided to just leave things as they are... Geoff?
- Geoff the Medio
- Programming, Design, Admin
- Posts: 13603
- Joined: Wed Oct 08, 2003 1:33 am
- Location: Munich
Re: GitHub migration procedure
Looking again, there's a public email droplist on the main profile edit page, separate from the email settings page, which has its own "Keep my email address private" check box that doesn't seem to do anything...? Or maybe just affects the commit logs? I don't know... but regardless, changing that droplist seems to have removed the email from my profile page.Vezzra wrote:...ask Geoff if he intends to keep the "public" email address you can now see on his profile page...
It's not a super important account, and is probably publically listed on sourceforge and other places already....I think it wasn't really his intention to make that email public.
I already have that account. It's added to the profile as well now. Which is set to primary appears, in the interface, to just set where notifications are sent.A solution would be to create another email address, like Dilvish did, e.g. [email protected], add that to his account...
Re: GitHub migration procedure
Well, my knowledge on the matter isn't so much better, but my inquiry wasn't really about if people think that Marcels approach will indeed give us a cleaner repo (I pretty much rely on his expertise regarding that).Geoff the Medio wrote:It's up to you. I have essentially no relevant knowledge or experience on this subject and think whatever you prefer to do is probably fine.
My question is more if you guys consider the promised advantages (cleaner linking of branches and tags, which I don't think will noticably affect our future work, but give us a clean commit history and no confusing mislinked tags/branches) worth having to keep everything on hold for yet another little while.
As I see it, we have three options:
- Decide we don't want to loose any more time, that our reimported repo with it's a bit screwed commit history when it comes to branches/tags is sufficient, and resume normal operation now.
- Decide that we can use a break anyway, and give Marcel the time to convert our svn repo the way he suggested. Which will probably take a few days.
- Decide that we want to give Marcels approach a try, give him the time to do that properly and not rush things, but don't want to keep everything on hold in the meantime. In that case, we could reopen the svn repo, continue working with it, and when Marcel is ready, close it down again, he does his magic, and then we switch to github.
- Geoff the Medio
- Programming, Design, Admin
- Posts: 13603
- Joined: Wed Oct 08, 2003 1:33 am
- Location: Munich
Re: GitHub migration procedure
Trying the cleaner import sounds fine. Having a bunch of branches showing up probably has made my attempts to use git so far even more complicated and confusing than they would already have been.
- adrian_broher
- Programmer
- Posts: 1156
- Joined: Fri Mar 01, 2013 9:52 am
- Location: Germany
Re: GitHub migration procedure
It should be done tomorrow. Aside from a single quirk I'm happy with the current outcome. It probably takes more time to upload the result, download the backup and investigate the authors map, than it took to fix/cleanup the repository.Which will probably take a few days
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz
Re: GitHub migration procedure
Which would be the important question: Which email do you want to appear in the commit logs as your author/committer email? That's the one Marcel should use, and that's also the one you need to tell your local git installation to use for commits (you can set that globally or for each repo, see the git documentation). It's better if that's the same email for all your commits.Geoff the Medio wrote:Or maybe just affects the commit logs?
Maybe the primary address is also used for commits you do via the github web interface? I'd guess so, but I'm not sure...I already have that account. It's added to the profile as well now. Which is set to primary appears, in the interface, to just set where notifications are sent.
- Geoff the Medio
- Programming, Design, Admin
- Posts: 13603
- Joined: Wed Oct 08, 2003 1:33 am
- Location: Munich
Re: GitHub migration procedure
I suppose [email protected] makes more sense.Vezzra wrote:Which email do you want to appear in the commit logs as your author/committer email?
Next to the "Keep my email address private" check in the email settings, it says "We will use [email protected] when performing web-based Git operations and sending email on your behalf."Maybe the primary address is also used for commits you do via the github web interface? I'd guess so, but I'm not sure...
Re: GitHub migration procedure
Geoff the Medio wrote:Trying the cleaner import sounds fine. Having a bunch of branches showing up probably has made my attempts to use git so far even more complicated and confusing than they would already have been.
Well, that's settled then.adrian_broher wrote:It should be done tomorrow. Aside from a single quirk I'm happy with the current outcome. It probably takes more time to upload the result, download the backup and investigate the authors map, than it took to fix/cleanup the repository.
The important thing (besides the cleanup of the repo) is that the commits get associated with the github accounts cleanly. That has so far worked best with the <svn-committer-name>@<svn-repo-uuid> email scheme. However, from what I've observed, the public email addresses set in the accounts seem to work equally well. Just avoid those <name>@users.noreply.github.com emails in the commit log... these caused the most troubles.
Re: GitHub migration procedure
I'll add a concurrence to what appears to be the consensus for option 2, and clearing out the large old binaries sounds worthwhile, even if it doesn't matter much to many of us.
If I provided any code, scripts or other content here, it's released under GPL 2.0 and CC-BY-SA 3.0
Re: GitHub migration procedure
Hm... maybe try committing something via the web interface (adding a text file with some lorem ipsum stuff ) and see what email got used for the commit log? If github really uses the anonymized email, maybe you can set only the gmail address as public/primary?Geoff the Medio wrote:Next to the "Keep my email address private" check in the email settings, it says "We will use [email protected] when performing web-based Git operations and sending email on your behalf."
Re: GitHub migration procedure
Well, if it's not too much trouble determining exactly which ones qualify as candidates, and removing them without screwing up anything around/connected... I still don't know what binary files we actually are talking about.Dilvish wrote:and clearing out the large old binaries sounds worthwhile, even if it doesn't matter much to many of us.
- Geoff the Medio
- Programming, Design, Admin
- Posts: 13603
- Joined: Wed Oct 08, 2003 1:33 am
- Location: Munich
Re: GitHub migration procedure
done but I don't presently have a way to view the log, so feel free to check it...Vezzra wrote:...try committing something via the web interface (adding a text file with some lorem ipsum stuff ) and see what email got used for the commit log?
- adrian_broher
- Programmer
- Posts: 1156
- Joined: Fri Mar 01, 2013 9:52 am
- Location: Germany
Re: GitHub migration procedure
Append .patch to the url to see a plain text version.Geoff the Medio wrote:done but I don't presently have a way to view the log, so feel free to check it...Vezzra wrote:...try committing something via the web interface (adding a text file with some lorem ipsum stuff ;)) and see what email got used for the commit log?
The 'From:' Key is the canonical author name.
https://github.com/freeorion/freeorion/ ... 64bf.patch
Resident code gremlin
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz
Attached patches are released under GPL 2.0 or later.
Git author: Marcel Metz