[PATCH] strbuf_branchname(): do not double-expand @{-1}~22

2013-05-15 Thread Junio C Hamano
If you were on 'frotz' branch before you checked out your current branch, git merge @{-1}~22 means the same as git merge frotz~22. The strbuf_branchname() function, when interpret_branch_name() gives up resolving @{-1}~22 fully, returns frotz and tells the caller that it only resolved @{-1} part

Re: [PATCH] strbuf_branchname(): do not double-expand @{-1}~22

2013-05-15 Thread Jeff King
On Wed, May 15, 2013 at 05:29:51PM -0700, Junio C Hamano wrote: If you were on 'frotz' branch before you checked out your current branch, git merge @{-1}~22 means the same as git merge frotz~22. The strbuf_branchname() function, when interpret_branch_name() gives up resolving @{-1}~22