I was recently working on a project which was hosted on AppEngine and I also wanted to keep on copy of my repository on github, but in my config file I had some secret keys that I didn’t want to push to github public repo. One of my friends Milad suggested to keep that config file in a separate branch let’s say ‘release’ and in your master which is supposed to go into github, remove that file from your repo. Yeeees! Sound grate!
Now I have a branch called release that’s going to be hosted in AppEngine and my master goes into github! Essentially git push to multiple servers. If you have a similar problem and you want an easy solution for that, here is a step by step guide to do that.
$ git remote add github https://github.com/boynux/myrepo.git
The above command will add new remote called github into your git config.
$ git checkout -b release -t origin/master $ git rm --cached config.py $ git commit -m "secret keys removed" $ git push origin release:master
This will create a new branch called
release which would be merged with master of github repo. Now checkout into master and remove config or secret files. You may also add it to .gitignore to avoid adding that mistakenly into master again.
git rm --cahched config.py does not remove file history in GIT. Obviously the config.py file is still accessible throughout GIT history. If you want to completely wipe-out this file from your GIT history please read “How to remove credentials from GIT history”.
Now it’s time to push master into its new home at github:
$ git push github master
We need to instruct GIT to push right branch into remote master branch based on current working branch. you can do this by providing remote branch in push so for origin (ie AppEngine) & github respectively with this commands:
$ git push origin release:master $ git push github master:master
But it’s little bit inconvenient to every time provide remote, local branch and remote branch let’s make it more automatic. I’m going to change default GIT push behaviour to match local and remote branches:
$ git branch master --set-upstream github/master $ git config push.default upstream
Well, we are done. Now you can simply checkout to release branch do changes and when you are done, simply type:
$ git checkout release # do other stuff here $ git add <changes> $ git commit $ git push
Then when you are done checkout to master and merge master with latest release changes and push that into github with the same command:
$ git checkout master $ git merge release $ git commit $ git push
That’s it. : -)
ABOUT BOYNUX bLOG
My notes and experiments with different technologies and tools. All information here is solely my personal thougths and does not relate to my employer's point of view in anyways.
FOLLOW BOYNUX FOR UPDATES AND BLOGS