asemanfar - a blog about programming

Mine:

   1  PS1='\[\033[00;32m\]\u\[\033[01m\]@\[\033[00;36m\]\h\[\033[01m\]:\[\033[00;35m\]\w\[\033[00m\]\[\033[01;30m\](`git branch 2>/dev/null|tr -d \*\ `)\[\033[00m\]\$ '

Evgeny,

Your solution doesn't work quite the same way. git branch outputs every local branch, so your solution would list all the branches, not just the current one.

So to fix that, you can pipe git branch through grep:

   1  git branch 2>/dev/null|grep -e ^* | tr -d \*\

Also, your solution includes the parenthesis regardless if you're in a git directory or not.

I'm sure there is a better way to do what I'm doing using sed or awk, but I'm not well-versed in either so I stuck to ruby.

Update: I took a stab at it in sed. (see bottom of post)

There is already a function to do this in the git distribution. If you check out the source there is a directory called contrib which has a bash completion file that gives you a __git_ps1 function.

Then you can just put \$(__git_ps1) somewhere in your PS1 and get the current branch. It doesn't output anything when you're not in a git directory. It also gives you branch name and subcommand tab completion.

this ends up in my ZSH prompt, but it should work for bash too and comes with as few backslashes as possible, which makes it even readabel:

   1  git_branch=`git branch 2>/dev/null | grep -e '^*' | sed -E 's/^\* (.+)$/(\1) /'`
   2    PS1="... $git_branch$path_prompt ..."

Philip

I've adapted the solution to work without any backslashes in a ZSH prompt theme environment.

Here's my take on this:

http://www.gnegg.ch/2008/04/git-branch-in-zsh-prompt/

Philip

Here is mine

   1  parse_git_branch() {
   2    git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
   3  }
   4  PS1="\w\$(parse_git_branch) $ "

I used a cut because the original solution was inclusing all branches upto the one I was working on, and one line break for each too ... the "cut version" is:

   1  git branch 2>/dev/null|cut -f2 -d\* -s

I've been doing the same thing, but I've found that

   1  git name-rev

tends to give more detailed output when you aren't on a branch (e.g. try checking out master^). The code I use is:

   1  git name-rev HEAD 2> /dev/null | awk "{ print \\$2 }"

I actually nabbed that code from someone else's bashrc a while ago, but I forgot to save a link and so can't give credit, unfortunately.

If you use the auto completion script that come with Git, you get the auto complete functionality plus the __git_ps1 method that Adam mentioned above. You can place the __git_ps1 method in your PS1 and get the branch name in your prompt. I've got a short tutorial on getting it working on OS X at http://blog.ericgoodwin.com/2008/4/10/auto-completion-with-git.

Eric

Well that was somewhat botched. Here it goes In ~/.bashrc

   1  parse_git_branch() {
   2    git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(git::\1)/'
   3  }
   4  parse_svn_branch() {
   5    parse_svn_url | sed -e 's#^'"$(parse_svn_repository_root)"'##g' | awk -F / '{print "(svn::"$1 "/" $2 ")"}'
   6  }
   7  parse_svn_url() {
   8    svn info 2>/dev/null | grep -e '^URL*' | sed -e 's#^URL: *\(.*\)#\1#g '
   9  }
  10  parse_svn_repository_root() {
  11    svn info 2>/dev/null | grep -e '^Repository Root:*' | sed -e 's#^Repository Root: *\(.*\)#\1\/#g '
  12  }
  13  export PS1="\[\033[00m\]\u@\h\[\033[01;34m\] \w \[\033[31m\]\$(parse_git_branch)\$(parse_svn_branch) \[\033[00m\]$\[\033[00m\] "

For git directories

   1  jeremyf@jnf ~/ccs_portal (git::master) $

For svn directories

   1  jeremyf@jnf ~/ccs_main/app/controllers (svn::ccs_main/trunk) $

Thanks for the plug!

I first learned it here:

http://acts.as.streeteasy.com/archives/2007/12/19/git_in_your_prompt/

After reading this post I switched over to the __git_ps1 method.

   1  export PS1='\[\033[01;32m\]\h\[\033[01;34m\] \w\[\033[31m\]$(__git_ps1 "(%s)") \[\033[01;34m\]$\[\033[00m\] '

The relevant part being...

   1  $(__git_ps1 "(%s)")

the 'grep | sed' part can be avoided and implemented in a single sed:

   1  parse_git_branch ()
   2  {
   3  	git name-rev HEAD 2> /dev/null | sed 's#HEAD\ \(.*\)#(git::\1)#'
   4  }
   5  parse_svn_branch() {
   6  	parse_svn_url | sed -e 's#^'"$(parse_svn_repository_root)"'##g' | awk -F / '{print "(svn::"$1 "/" $2 ")"}'
   7  }
   8  parse_svn_url() {
   9  	svn info 2>/dev/null | sed -ne 's#^URL: ##p'
  10  }
  11  parse_svn_repository_root() {
  12  	svn info 2>/dev/null | sed -ne 's#^Repository Root: ##p'
  13  }

I've since added a Unicode skull and crossbones when I'm in a branch with uncommitted changes:

http://www.scrnshots.com/users/topfunky/screenshots/89842