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: Felipe Contreras <felipe.contreras@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 5/9] t1508 (at-combinations): document @{N} versus HEAD@{N}
Date: Thu,  2 May 2013 19:09:30 +0530	[thread overview]
Message-ID: <1367501974-6879-6-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1367501974-6879-1-git-send-email-artagnon@gmail.com>

All the tests so far check that @{N} is the same as HEAD@{N} (for
positive N).  However, this is not always the case: write a couple of
tests for this.

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 eaa5337..29ffd73 100755
--- a/t/t1508-at-combinations.sh
+++ b/t/t1508-at-combinations.sh
@@ -59,4 +59,18 @@ nonsense "@{1}@{u}"
 nonsense "HEAD@{-1}"
 nonsense "@{-1}@{-1}"
 
+# Document differences between @{N} and HEAD@{N}.  The former resolves
+# HEAD to a branch and looks up the logs for that branch, while the
+# latter looks for the logs of HEAD.
+check "HEAD@{3}" commit old-two
+nonsense "@{3}"
+
+test_expect_success 'switch to old-branch' '
+	git checkout old-branch
+'
+
+check HEAD refs/heads/old-branch
+check "HEAD@{1}" commit new-two
+check "@{1}" commit old-one
+
 test_done
-- 
1.8.3.rc0.40.g09a0447

  parent reply	other threads:[~2013-05-02 13:38 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-02 13:39 [PATCH v2 0/9] A natural solution to the @ -> HEAD problem Ramkumar Ramachandra
2013-05-02 13:39 ` [PATCH 1/9] t1508 (at-combinations): simplify setup Ramkumar Ramachandra
2013-05-02 13:39 ` [PATCH 2/9] t1508 (at-combinations): test branches separately Ramkumar Ramachandra
2013-05-02 17:23   ` Felipe Contreras
2013-05-02 17:28     ` Ramkumar Ramachandra
2013-05-02 17:30       ` Felipe Contreras
2013-05-02 13:39 ` [PATCH 3/9] t1508 (at-combinations): improve nonsense() Ramkumar Ramachandra
2013-05-02 13:39 ` [PATCH 4/9] t1508 (at-combinations): increase coverage Ramkumar Ramachandra
2013-05-02 14:26   ` Eric Sunshine
2013-05-02 13:39 ` Ramkumar Ramachandra [this message]
2013-05-02 17:27   ` [PATCH 5/9] t1508 (at-combinations): document @{N} versus HEAD@{N} Felipe Contreras
2013-05-02 17:30     ` Ramkumar Ramachandra
2013-05-02 17:34       ` Felipe Contreras
2013-05-02 17:38     ` Ramkumar Ramachandra
2013-05-02 13:39 ` [PATCH 6/9] t1508 (at-combinations): test with symbolic refs Ramkumar Ramachandra
2013-05-02 13:39 ` [PATCH 7/9] remote.c: teach branch_get() to treat symrefs other than HEAD Ramkumar Ramachandra
2013-05-02 14:37   ` Ramkumar Ramachandra
2013-05-02 15:43     ` Ramkumar Ramachandra
2013-05-02 16:57   ` Felipe Contreras
2013-05-02 13:39 ` [PATCH 8/9] sha1_name.c: fix @-parsing bug in interpret_branch_name() Ramkumar Ramachandra
2013-05-02 13:39 ` [PATCH 9/9] refs.c: make @ a pseudo-ref alias to HEAD Ramkumar Ramachandra
2013-05-02 17:18 ` [PATCH v2 0/9] A natural solution to the @ -> HEAD problem Ramkumar Ramachandra
2013-05-02 17:25   ` Felipe Contreras
2013-05-02 17:34     ` 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=1367501974-6879-6-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).