Getting Git Code Management

I am now the code manager for the public repository of a project that takes pull requests from several active forks and has tagged releases. The problem is, that I've not found any single resource that covers advanced code management using Git. My local repository has multiple upstream sources that I synchronize. All are hosted at github.com.
This post is going to be a collection of little Git recipes. Many of them are collected from somewhere else, but others are more specific to the code management processes

Configure git for certificate-based credentials for multiple logins

Generate certificate

I was able to get this working by following the instructions here. However, I also needed to add some commands to my "~/.basrc" file to provide my SSH credentials to the git/bash shell window. Each ssh-add command adds one certificate to the identity store.

#! /bin/bash 
eval `ssh-agent -s` 
ssh-add ~/.ssh/github_rsa
ssh-add ~/.ssh/github_admin_rsa

Make the local copy an exact copy of a named remote and branch

git reset remote/branch --hard
git clean -fd

Update the local copy to have all the changes in a named remote and branch

git pull -X ours --rebase remote branch

Merge changes into the local copy from named remote and branch

git merge remote/branch

Merge a remote pull request locally (after a clean)

git fetch remote 
git merge remote/pr/123

Push to a remote

git push remote branch

Create a new local branch

git checkout -b newBranch

Copy a remote branch locally

git checkout -b localBranch remote/branch

Apply a tag or overwrite an existing one.

A tag works like a branch in many respects, so you can do a "git checkout tagName" to get the tagged version.
git tag tagName -f

Update a tag with a cherry-picked commit

git checkout my_tag
git cherry-pick commit_123
git tag -f my_tag
git push repository --tags

Master and upstream repositories

For these commands, if you have supplied the credentials using the certificate method listed above, the URL will include the alias name contained in the "~/.ssh/config" file. I.e. use git@github-user:GithubUser/repo.git instead of "https://github.com/GithubUser/repo.git". Your config file should look something like this:

#~/.ssh/config
ForwardAgent yes
Host github-user
  HostName github.com
  User git
  IdentityFile ~/.ssh/github_user_rsa
Host github-admin
  HostName github.com
  User git
  IdentityFile ~/.ssh/github_admin_rsa

and your "git remote -v" command should yield something like this:

user git@github-user:Organization/repository.git (fetch)
user git@github-user:Organization/repository.git (push)
admin git@github-admin:Organization/repository.git (fetch)
admin git@github-admin:Organization/repository.git (push)

by using the "user" and "admin" repository aliases, you work with the same repository from different accounts!

Clone a remote repository locally

git clone https://github.com/.../somerepo.git

Add a new upstream repository to a local

git remote add upstreamBranchName https://github.com/.../repo.git

Comments

Post a Comment

Popular posts from this blog

Database Projects, SQL Unit Tests, and TeamCity

Image
Continuous Integration  is a really good idea, especially when you are working with a team of developers. There are lots of tools out there that can help your team build better quality into your application. TeamCity by JetBrains is one such tool that has been around for awhile; specifically, it is the one that my company uses. Visual Studio has Database Projects   SQL Server Data Tools  to address some of the inconsistencies that developers face when using a database as a storage layer; Things like version control and consistent deployment. It also includes SQL unit tests , which fills a huge gap if any  of your logic is in the database. Many organizations moved away from logic in the database years ago because it was tricky (at best) to verify logic on the data tier, of course, they were also making changes directly to the database itself... but I digress. If you are using SQL Server Data Tools, and run your unit tests locally, it is a joy to behold. Your database is automatical
Read more

Brent: Programmer. Gamer. Cheapskate. All around good guy.

So... not being one that can leave a sore spot alone, when Brent Brown sent me an email Brent his "preferred" blog link so that I could update the link I had created to Stubenville , I naturally couldn't just update my previous blog entry. I needed to take the opportunity to pour lemon juice, salt, and vinegar into the wound until it became a pulp of agonized flesh. It may be because that's the way I am, but it may also be because Brent really needs this kind of opposition in his life. After all, he has a wonderful wife and cute kids, but as far as I can see, nobody that really gives him the harassing that he needs to keep his life in balance. That's where I come in. I don't know what the big deal is... after all, I liked the Stubenville (not Stupid-ville, that's a whole other wound that needs opening from time to time) thread. However, since he isn't there any more, I suppose that it has a limited shelf life. So, if anyone actualy reads my blog, you
Read more

Building nice XML from SQL Server Tables

The XML functionality of SQL Server is vast, however, the best subset of that functionality that I've found may be demonstrated in the following example: Unfortunately, the example result is listed before the code. Join all the desired tables together Set the desired root element Set the path to an empty string to avoid an extra XML element at the root of each resulting row Provide an XPATH name with attributes for each of the desired columns (select * doesn't work well) Keep all the selected columns together by XPATH name or you'll split your xml attributes See my next blog entry for my best way to shred the xml
Read more