patchAdd git-branches-script

For people whose workflow involves switching back and forth between a lot of branches, it can be really helpful to be able to quickly tell which branch you are on and which ones are available. This patch introduces a small script that when invoked as `git branches' prints a list of available branches with a star in front of the one you are on:

 $ cd linux-2.6/
 $ git checkout -b ppc64-cleanups
 $ git checkout -b ppc64-new-devel
 $ git checkout -b ppc64-all-merge
 $ git branches
   master
 * ppc64-all-merge
   ppc64-cleanups
   ppc64-new-devel

Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu>

---

 git-branches-script |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
 create mode 100755 git-branches-script

12ab86f36137c4ffd1fb9b878479b9befe4cf2d4

Amos Waterland <apw@rossby.metr.ou.edu> writes:

I would prefer to using some git command compared to 'ls -l .git/refs/heads/'. In my opinion there is a need for this command and it should be included.

But my immediate concern was that there is already 'git branch' command and 'git branches' is too similar. I think they should be merged. I have a patch coming up.

If no argument provided to `git branch`, show available branches and mark current branch with star.

This is based on patch written by Amos Waterland <apw@rossby.metr.ou.edu>.

Signed-off-by: Kalle Valo <Kalle.Valo@iki.fi>
---

 git-branch-script |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

38aca3bb4ad4e6b0e10e295a87a9f5ce37ff5be4

Kalle Valo <Kalle.Valo@iki.fi> writes:

I like the general direction, but this particular implementation may be a bit troublesome.

I do not think we have agreed to limit ourselves to a flat namespace under refs/heads without subdirectories. Something like what git-show-branches-script does when $# == 0, perhaps?

Junio C Hamano <junkio@cox.net> writes:

I didn't realise this. I'll send a revised patch soon.

Kalle Valo <Kalle.Valo@iki.fi> writes:

Ah, but you fixed it already. Thanks!

* Amos Waterland <apw@rossby.metr.ou.edu> [2005-08-16 00:48]:

Some might find it useful to put Amos' script in a bash function and then put the current branch in the prompt. What I did was to put this function in my .bashrc:

gitbranch () {
	. git-sh-setup-script &&
	branch=$(basename $(readlink $GIT_DIR/HEAD)) &&
	echo -n "" $branch ""
}

Then I modified my bash prompt:

export PS1='\[\033[1;31m\]\j$(gitbranch)[\w]\$ \[\033[0m\]'
                            ^^^^^^^^^^^

Now, if my current dir is not a git repo, I have my regular prompt. As soon as I cd into a git repo, I get the current branch in the prompt, as follows:

0[~]$ cd gitrepo 0 master [~/gitrepo]$ git checkout branch1 0 branch1 [~/gitrepo]$ cd .. 0[~]$