Re: [PATCH 1/2] t1506: more test for @{upstream} syntax

From: Jeff King <peff@peff.net>
Date: Jan 28, 2010, 09:44 UTC
Message-ID: <20100128094446.GA14244@coredump.intra.peff.net>
In-Reply-To: <7veilbqs82.fsf@alter.siamese.dyndns.org>

On Wed, Jan 27, 2010 at 11:10:21AM -0800, Junio C Hamano wrote:

Show 6 quoted lines

> I wanted to do something like what your patch does by iterating over the
> input inside get_sha1_basic() while we still see @{...}, parsing pieces
> from the beginning, not from the end like the original "do we have the
> reflog indicator at the end?  If so strip it and deal with what we have at
> the front".  Your patch to i-b-n does that by recursing inside, which is a
> nice solution.

Yeah, I wanted to do that too, but it just ended up very messy. I suppose the i-b-n solution is reasonably elegant, and it should correctly handle non-get-sha1 instances like:

  git checkout @{-1}@{u}

> Care to roll a patch with additional tests, to build on top of 105e473
> (Fix log -g this@{upstream}, 2010-01-26)?

Yep, series to follow:

  [1/3]: test combinations of @{} syntax
  [2/3]: fix parsing of @{-1}@{u} combination
  [3/3]: reject @{-1} not at beginning of object name

-Peff