From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, jrnieder@gmail.com,
Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v3 3/3] rev-parse: tests git rev-parse --verify master@{n}, for various n
Date: Tue, 24 Aug 2010 14:52:44 +1000 [thread overview]
Message-ID: <1282625564-12752-4-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <20100824001454.GB17406@burratino>
This commit introduces tests that verify that rev-parse
parses master@{n} correctly for various values of n less
than, equal to and greater than the number of revisions
in the reference log.
In particular, these tests check that rev-parse exits with a
non-zero status code and prints a message of the
following form to stderr.
fatal: Log for [^ ]* only has [0-9][0-9]* entries.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
t/t1503-rev-parse-verify.sh | 11 +++++++++++
t/t1506-rev-parse-diagnosis.sh | 9 +++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index cc65394..61092f7 100755
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -104,4 +104,15 @@ test_expect_success 'use --default' '
test_must_fail git rev-parse --verify --default bar
'
+test_expect_success 'master@{n} for various n' '
+ N=$(git reflog | wc -l) &&
+ Nm1=$((N-1)) &&
+ Np1=$((N+1)) &&
+ git rev-parse --verify master@{0} &&
+ git rev-parse --verify master@{1} &&
+ git rev-parse --verify master@{$Nm1} &&
+ test_must_fail "git rev-parse --verify master@{$N}" &&
+ test_must_fail "git rev-parse --verify master@{$Np1}"
+'
+
test_done
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index af721f9..0eeeb0e 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -66,4 +66,13 @@ test_expect_success 'incorrect file in :path and :N:path' '
grep "fatal: Path '"'"'disk-only.txt'"'"' exists on disk, but not in the index." error
'
+test_expect_success 'invalid @{n} reference' '
+ test_must_fail git rev-parse master@{99999} >output 2>error &&
+ test -z "$(cat output)" &&
+ grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error &&
+ test_must_fail git rev-parse --verify master@{99999} >output 2>error &&
+ test -z "$(cat output)" &&
+ grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error
+'
+
test_done
--
1.7.2.1.100.gceecd
next prev parent reply other threads:[~2010-08-24 4:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-18 11:36 RFD: should git rev-parse exit with non-zero status if ref@{n} is not valid? Jon Seymour
2010-08-18 11:41 ` Jon Seymour
2010-08-18 20:50 ` Junio C Hamano
2010-08-18 23:02 ` Jon Seymour
2010-08-21 1:43 ` [PATCH 0/4] rev-parse: improve reporting of invalid log references Jon Seymour
2010-08-21 1:43 ` [PATCH 1/4] rev-parse: exit with non-zero status if ref@{n} is not valid Jon Seymour
2010-08-21 1:43 ` [PATCH 2/4] rev-parse: suppress duplicate log limit exceeded message Jon Seymour
2010-08-22 21:20 ` Junio C Hamano
2010-08-23 14:59 ` Jon Seymour
2010-08-23 16:33 ` Junio C Hamano
2010-08-23 23:11 ` [PATCH v2 0/2] rev-parse: strengthen validation of ref@{n} references Jon Seymour
2010-08-23 23:11 ` [PATCH v2 1/2] rev-parse: exit with non-zero status if ref@{n} is not valid Jon Seymour
2010-08-24 0:14 ` Jonathan Nieder
2010-08-24 4:52 ` [PATCH v3 0/3] rev-parse: strengthen validation of ref@{n} references Jon Seymour
2010-08-24 4:52 ` [PATCH v3 1/3] rev-parse: exit with non-zero status if ref@{n} is not valid Jon Seymour
2010-08-24 4:52 ` [PATCH v3 2/3] sha1_name.c: use warning in preference to fprintf(stderr Jon Seymour
2010-08-24 4:52 ` Jon Seymour [this message]
2010-08-23 23:11 ` [PATCH v2 2/2] rev-parse: tests git rev-parse --verify master@{n}, for various n Jon Seymour
2010-08-21 1:43 ` [PATCH 3/4] rev-parse: introduce get_sha1_gently Jon Seymour
2010-08-21 1:43 ` [PATCH 4/4] rev-parse: tests that git rev-parse --verify master@{n} Jon Seymour
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=1282625564-12752-4-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.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).