git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Felipe Contreras <felipe.contreras@gmail.com>,
	Jeff King <peff@peff.net>, Duy Nguyen <pclouds@gmail.com>
Subject: [PATCH 1/5] t1508 (at-combinations): more tests; document failures
Date: Wed,  1 May 2013 21:50:31 +0530	[thread overview]
Message-ID: <1367425235-14998-2-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1367425235-14998-1-git-send-email-artagnon@gmail.com>

To emphasize what we're testing in @{1}@{u}, document that @{0}@{0} is
also nonsense.  This makes it clear that @{<n>} does not resolve to a
ref whose upstream we can determine with @{u}/ reflog we can dig with
@{0}.

Since HEAD is implicit in @{}, check that HEAD@{} works fine for these
cases.  It doesn't make sense in @{-<n>} because @{-<n>} cannot be
used with anything other than HEAD, and interpret_nth_prior_checkout()
hard-codes "HEAD".

Additionally, document bugs in the @-parser by symbolic-ref'ing @ to
HEAD and re-running some tests.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 t/t1508-at-combinations.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index d5d6244..efa2a2a 100755
--- a/t/t1508-at-combinations.sh
+++ b/t/t1508-at-combinations.sh
@@ -39,13 +39,27 @@ test_expect_success 'setup' '
 
 check HEAD new-two
 check "@{1}" new-one
+check "HEAD@{1}" new-one
+check "@{now}" new-two
+check "HEAD@{now}" new-two
 check "@{-1}" old-two
 check "@{-1}@{1}" old-one
 check "@{u}" upstream-two
+check "HEAD@{u}" upstream-two
 check "@{u}@{1}" upstream-one
 check "@{-1}@{u}" master-two
 check "@{-1}@{u}@{1}" master-one
 nonsense "@{u}@{-1}"
+nonsense "@{0}@{0}"
 nonsense "@{1}@{u}"
+nonsense "HEAD@{-1}"
+
+# Make sure that the @-parser isn't buggy; check things with
+# symbolic-ref @ pointing to HEAD.
+git symbolic-ref @ HEAD
+check "@@{1}" new-one
+check "@@{now}" new-two
+check "@@{u}" upstream-two failure
+nonsense "@@{-1}"
 
 test_done
-- 
1.8.3.rc0.24.g6456091

  reply	other threads:[~2013-05-01 16:20 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-01 16:20 [PATCH 0/5] A natural solution to the @ -> HEAD problem Ramkumar Ramachandra
2013-05-01 16:20 ` Ramkumar Ramachandra [this message]
2013-05-01 18:53   ` [PATCH 1/5] t1508 (at-combinations): more tests; document failures Junio C Hamano
2013-05-01 21:04     ` Ramkumar Ramachandra
2013-05-01 21:16       ` Jeff King
2013-05-01 22:01         ` Ramkumar Ramachandra
2013-05-01 22:54         ` Junio C Hamano
2013-05-02  2:22     ` Felipe Contreras
2013-05-02  9:07       ` Ramkumar Ramachandra
2013-05-02  9:45         ` Felipe Contreras
2013-05-02 11:03           ` Ramkumar Ramachandra
2013-05-02 11:36             ` Ramkumar Ramachandra
2013-05-02 16:45             ` Felipe Contreras
2013-05-02 16:56               ` Ramkumar Ramachandra
2013-05-02 17:01                 ` Felipe Contreras
2013-05-02 17:02                 ` Ramkumar Ramachandra
2013-05-02 17:08                   ` Felipe Contreras
2013-05-02 17:09                     ` Ramkumar Ramachandra
2013-05-04  8:10                       ` David Aguilar
2013-05-04  8:16                         ` David Aguilar
2013-05-01 16:20 ` [PATCH 2/5] sha1_name.c: don't waste cycles in the @-parsing loop Ramkumar Ramachandra
2013-05-01 17:57   ` Felipe Contreras
2013-05-01 18:48     ` Ramkumar Ramachandra
2013-05-02  0:04     ` Junio C Hamano
2013-05-01 16:20 ` [PATCH 3/5] sha1_name.c: simplify @-parsing in get_sha1_basic() Ramkumar Ramachandra
2013-05-01 18:09   ` Felipe Contreras
2013-05-01 18:36     ` Ramkumar Ramachandra
2013-05-01 18:54       ` Jonathan Nieder
2013-05-01 19:55         ` Ramkumar Ramachandra
2013-05-01 19:23       ` Felipe Contreras
2013-05-01 19:40         ` Ramkumar Ramachandra
2013-05-01 22:18           ` Felipe Contreras
2013-05-01 22:26             ` Ramkumar Ramachandra
2013-05-01 22:39               ` Felipe Contreras
2013-05-01 22:06   ` Ramkumar Ramachandra
2013-05-01 16:20 ` [PATCH 4/5] remote.c: teach branch_get() to treat symrefs other than HEAD Ramkumar Ramachandra
2013-05-01 18:16   ` Felipe Contreras
2013-05-01 18:44     ` Ramkumar Ramachandra
2013-05-01 19:28       ` Felipe Contreras
2013-05-01 19:50         ` Ramkumar Ramachandra
2013-05-01 20:48           ` Felipe Contreras
2013-05-01 20:57             ` Ramkumar Ramachandra
2013-05-01 22:23               ` Felipe Contreras
2013-05-01 16:20 ` [PATCH 5/5] refs.c: make @ a pseudo-ref alias to HEAD Ramkumar Ramachandra
2013-05-01 18:20   ` Felipe Contreras
2013-05-01 19:00     ` Ramkumar Ramachandra
2013-05-01 19:31       ` Felipe Contreras
2013-05-01 19:51         ` Ramkumar Ramachandra
2013-05-01 21:49 ` [PATCH 0/5] A natural solution to the @ -> HEAD problem Ramkumar Ramachandra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1367425235-14998-2-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).