botsko » Git

Git Status in Command Line

Michael Botsko — Tue, 16 Mar 2010 21:43:34 +0000

There are many tricks out there to get the git status to show in the command line path, but here’s one that worked the best for me on a Mac OS X Snow Leopard machine.

Download the git tarball, and find the contrib/completion/git-completion.bash file. Move it to a good location on your system. In my situation I went with:

/opt/local/etc/bash_completion.d/git-completion

Import that code into your .bash_profile and then add in the code necessary to append the branch name output:

. /opt/local/etc/bash_completion.d/git-completion PS1='\h:\W$(__git_ps1 "(%s)") \u\$ '

You’re done. If you’re getting the “command not found” error after restarting the terminal, be sure your completion file is in the right spot.

If you want to color things a bit, you could change it to one of the options below:

RED="\[\033[0;31m\]" GREEN="\[\033[0;32m\]" YELLOW="\[\033[0;33m\]" BLUE="\[\033[0;34m\]" PURPLE="\[\033[0;35m\]" TEAL="\[\033[0;36m\]" GRAY="\[\033[0;37m\]" WHITE="\[\033[0;38m\]" PS1="$TEAL\h: $GRAY\W$GREEN \$(__git_ps1 '(%s)')$WHITE \$ "

A ton of different ways can be found here:
http://asemanfar.com/Current-Git-Branch-in-Bash-Prompt

Installing Git on Mac OS X Snow Leapord

Michael Botsko — Thu, 18 Feb 2010 16:37:21 +0000

Git is an amazing source control system, and is even better when used with GitHub.com. Installing git on Mac is pretty simple.

First, download the latest version from git-scm.com. Extract the contents of the archive and open terminal to the new folder.

Note: Since this requires compiling, you must have the developer tools installed. Download and install the Xcode package from Apple.

$ ./configure --prefix=/opt/git $ make $ sudo make install

Now that it’s installed, you need to make sure it’s in your path. Add the following content your bash profile:

$ vi ~/.bash_profile
export PATH=${PATH}:/opt/git/bin

Restart terminal and you should see the manual for git when you run the git command.

Version Numbers Using git tag, git describe

Michael Botsko — Thu, 31 Dec 2009 00:39:42 +0000

I’ve spent the past year doing all of my development using the Git version control system. It’s far better than than subversion and has made my job as project manager/developer/commit manager much easier.

However, since it does not use revision numbers like subversion it’s more difficult to include as build numbers or version numbers. I wanted some automated way to identify the build in some way other than a non-incremental SHA1-hash. The only solution I’ve been able to find (without using any external software) is as follows.

The workflow to make this process work as expected would involve the following:

Prepare master for a new release. Create a new branch for the release and tag it with 1.0.
Make a single commit on master (necessary to separate the history) and re-tag with something for the next revision, like 1.1-alpha.
Tags on branch continue with 1.0-1, 1.0-2, etc. Tags on master continue with 1.1-alpha-1, 1.1-alpha-2, etc.

What’s problematic with this is the requirement to both tag and branch each time you want a release. You also need to add in a extra commit before re-tagging master so there’s an unwanted extra step.

Create a new repo for a test file:
$ echo "testing" > myfile $ git init $ git add . $ git commit -m "testing"

No tags yet. Create branch for 1.0
$ git checkout -b 1.0 $ git tag -a 1.0 -m "Tagging for 1.0" $ echo "changing my text" > myfile $ git commit -a -m "updated" $ git describe

At this point, you’ll see something like: 1.0-1-ga3548ab. And if you run describe on the master branch, it still will report as ’1.0′.

Now, you need to create a single commit on master to “begin” the flow towards the next release. I’d recommend manually updating some code or text in your files for the new major version, since you obviously want this to be a minor commit.
$ echo "changing my text for next release" > myfile $ git commit -a -m "updated"
$ git tag -a 1.1-alpha -m "Beginning work on next release"

When you run describe on the master branch it will now report properly as “1.1-alpha”. Yet as you continue bugfixes on the 1.0 branch, it will stay as “1.0-2-g1f37eb1″, etc.

If you have more information or a better way (with or without external software) then please let me know.

Creating a Remote Git Repository

Michael Botsko — Thu, 13 Aug 2009 21:54:10 +0000

Here is a quick and dirty guide to create your own remote repository. Access is controlled through standard ssh so it’s as secure as your ssh access is.

$ mkdir /git/repos/myapp.git $ cd /git/repos/myapp.git $ git --bare init $ exit

On your local machine, find the local git repository that you want to push to the remote location.

$ git remote add origin ssh://yourdomain.com/git/repos/myapp.git $ git push origin master

Now your local repo will be tracking the remote repository and you may continue pushing/pulling it from anywhere.

Installing Git on Cent OS 5

Michael Botsko — Thu, 13 Aug 2009 21:50:30 +0000

It’s pretty straightforward to install Git on a mediatemple DV 3.0 server. If you have later versions of their servers with Yum installed, you may be able to simply install it through yum.

To begin you need to download the latest version and run through the standard extraction and configure/make/make install.

$ wget http://kernel.org/pub/software/scm/git/git-1.6.4.tar.gz $ tar -zxvf *.gz $ cd git* $ ./configure --prefix=/usr/local $ make $ make install

Try entering git into the command line to ensure that everything installed properly.

Turn on command line coloring, very helpful:
$ git config --global color.branch "auto" $ git config --global color.status "auto" $ git config --global color.diff "auto"

That’s it!