Merge branch 'jc/strbuf-branchname-fix' into maint
commit872f5bfb08b16057fdc02bb758abedcc6e4379ca
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:02 +0000 (27 14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:02 +0000 (27 14:38 -0700)
treeaf635cee878b432f8d614cb0140d174e2d729034
parenta0bf40ddc94d8ec57c2422b29ba82f3450211300
parent84cf246670eab56a23ed5554ed084053a0f19f2d
Merge branch 'jc/strbuf-branchname-fix' into maint

* jc/strbuf-branchname-fix:
  strbuf_branchname(): do not double-expand @{-1}~22