Re: [PATCH v2 2/2] Teach @{-1} to git merge
- From
- Deskin Miller <deskinm@gmail.com>
- Date
- Feb 27, 2009, 04:27 UTC
- Message-ID
- <86d4c5e00902262027y13b19eb7nf89a45e83b986801@mail.gmail.com>
- In-Reply-To
- <alpine.DEB.1.00.0902142332210.10279@pacific.mpi-cbg.de>
On Sat, Feb 14, 2009 at 17:52, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 16 quoted lines
> 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).
>I did 'git branch -M @{-1}' yesterday and ended up renaming my branch to refs/heads/@{-1}. Personally my usage felt like it should work (but of course I think that); curious to know what others think, if this is a bug.
Deskin Miller