Re: [PATCH v2 2/2] Teach @{-1} to git merge

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 14, 2009, 22:52 UTC
Message-ID: <alpine.DEB.1.00.0902142332210.10279@pacific.mpi-cbg.de>
In-Reply-To: <7vskmhuzla.fsf_-_@gitster.siamese.dyndns.org>

Hi,

On Sat, 14 Feb 2009, Junio C Hamano wrote:

>  * I know "show-branch @{-1} HEAD" does not dereference @{-1}, but I
>    suspect there may be many others.

I scanned command-list.txt briefly, and could verify (by testing rather than code inspection) that

- bundle works as expected (thanks to dwim_ref()),

- fast-export (like bundle, dwim_ref() makes it work),

- so does filter-branch, thanks to rev-parse --symbolic-full-name 
  resolving @{-<n>} correctly,

- log and reflog also substitute @{-<n>} by the branch name,

- update-ref does _not_ interpret @{-<n>} as the branch name (which I 
  find okay, as update-ref is plumbing), but instead creates the file 
  '.git/@{-<n>}' (which I think is a bug).

Now, show-branch indeed does not substitute the branch _name_, but otherwise it works correctly, no? And given the fact that show-branch does not substitute "HEAD" with the current branch name, either, I wonder if show-branch needs fixing at all.

Ciao, Dscho