Merge branch 'js/branch-symref'
commit814742672f765e379f7809eab7650e8ad0a24c35
authorJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:35 +0000 (5 15:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Mar 2009 23:41:35 +0000 (5 15:41 -0800)
tree0b39f14aa6deeb6a35a3effced48faaefb3813ef
parent4a2caf691232ef9599ee3f1a1a04a47f309e65c1
parent0afc304406196e4470fd2a628c3733e966068d98
Merge branch 'js/branch-symref'

* js/branch-symref:
  add basic branch display tests
  branch: clean up repeated strlen
  Avoid segfault with 'git branch' when the HEAD is detached
  builtin-branch: improve output when displaying remote branches

Conflicts:
builtin-branch.c
builtin-branch.c