Alright, I created an account on gitgud and made a first merge request.
Before I spend too much time contributing, what do you think about restoring the git history from GitHub (
https://github.com/themightyglider/RogueBox-Adventures) in your gitgud repo? With some git magic I could probably do it, and let you force push it to your gitgud repo to overwrite the history. I'll wait for your go though, as I don't want to spend time on it if you're not interested.
Edit: OK I lied, since it was easy I still prepared a merged history of the two repos.
Here it is:
https://github.com/akien-mga/RogueBox-AdventuresYou can easily clone it, and then force push it to your gitgud repo's master branch.
Here's how I did it:
1) Cloned both repos
- {l Code}: {l Select All Code}
git clone https://github.com/akien-mga/RogueBox-Adventures RBA-GH
git clone https://gitgud.io/themightyglider/RogueBoxAdventures RBA-GG
2) Reset GitHub repo to HEAD~1 (we don't want the commit saying the repo moved)
- {l Code}: {l Select All Code}
cd RBA-GH
git rebase -i HEAD~2
// remove the line about the last commit, save
cd ..
3) Apply the diffs between GH's last commit and GG's first commit, which were not versioned in git
- {l Code}: {l Select All Code}
cd RBA-GG
git checkout 5b2a06e // first commit in GG
cp -a * ../RBA-GH
cd ../RBA-GH
git diff // check the differences, indeed there are some untracked changes
GIT_COMMITTER_DATE="Sat Aug 13 12:00:00 2016 +0200" git commit --date="Sat Aug 13 12:00:00 2016 +0200" -a 'Transition between GitHub repo and initial gitgud commit
Developments done by themightyglider <themightyglider@gmx.de>,
though non-documented.
Authorship and commit date have been faked to ensure a linear git
history, real commit date was Mon Oct 3 19:19:58 2016 +0200.'
// that will be the only commit made in my name
cd ..
4) Retrieve all patches from the GG clone to apply on top of the bridged GH clone
- {l Code}: {l Select All Code}
cd RGA-GG
git checkout master // back to the HEAD of the master branch
git format-patch -16 // 17 commits, but we don't want the first "Initial commit on gitgud" one, since it would conflict with the GH clone's HEAD
mv *.patch ../RGA-GH
cd ..
5) Apply all patches on top of the GH clone's HEAD. Here we use a trick to "fake" the committer credits, so that nobody knows I had an impact there (some platforms, maybe GitLab, show the committer in the commit history instead of the author like on GitHub, so it's better for readability this way. Nobody needs to know that I did this history merging).
- {l Code}: {l Select All Code}
cd RGA-GH
for file in *.patch; do
GIT_COMMITTER_NAME="themightyglider" GIT_COMMITTER_EMAIL="themightyglider@gmx.de" git am --committer-date-is-author-date $file;
done
6) Check the status, tadaa! And push to a new repo.
- {l Code}: {l Select All Code}
git status // worked fine
git log --pretty=full // shows that author and committer and indeed the same person
git remote add akien https://github.com/akien-mga/RogueBox-Adventures // was a GH fork of the GH repo
git push --force akien master // force push is needed since we rewrote history by dropping the last GH commit
// bask in glory
And that's it. The only thing that looks a bit weird is the transition commit I had to make, which appears at the top of the commit history even though it's actually nudged between the GH state and the GG one. But it's better than no history IMO
I could have faked its date too though.
Edit: I've actually done that and adapted instructions accordingly. I've also updated my GH repo, so you can use it directly.
Now if you want to push this updated git repo to your gitgud instance, you can do:
- {l Code}: {l Select All Code}
git checkout -b merged-history
git remote add akien-gh https://github.com/akien-mga/RogueBox-Adventures
git fetch akien-gh
git reset --hard akien-gh/master // will replace your merged-history branch with the contents of my akien-gh/master
git log // always check that it worked
git status // same
// if you're happy:
git push --force origin merged-history:master
// if you're not happy:
git checkout master // back to your old branch
