Skip to content

Commit 9c46c05

Browse files
jonseymourgitster
authored andcommitted
rev-parse: tests git rev-parse --verify master@{n}, for various n
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent eedce78 commit 9c46c05

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

t/t1503-rev-parse-verify.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,15 @@ test_expect_success 'use --default' '
104104
test_must_fail git rev-parse --verify --default bar
105105
'
106106

107+
test_expect_success 'master@{n} for various n' '
108+
N=$(git reflog | wc -l) &&
109+
Nm1=$((N-1)) &&
110+
Np1=$((N+1)) &&
111+
git rev-parse --verify master@{0} &&
112+
git rev-parse --verify master@{1} &&
113+
git rev-parse --verify master@{$Nm1} &&
114+
test_must_fail "git rev-parse --verify master@{$N}" &&
115+
test_must_fail "git rev-parse --verify master@{$Np1}"
116+
'
117+
107118
test_done

t/t1506-rev-parse-diagnosis.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,13 @@ test_expect_success 'incorrect file in :path and :N:path' '
6666
grep "fatal: Path '"'"'disk-only.txt'"'"' exists on disk, but not in the index." error
6767
'
6868

69+
test_expect_success 'invalid @{n} reference' '
70+
test_must_fail git rev-parse master@{99999} >output 2>error &&
71+
test -z "$(cat output)" &&
72+
grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error &&
73+
test_must_fail git rev-parse --verify master@{99999} >output 2>error &&
74+
test -z "$(cat output)" &&
75+
grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error
76+
'
77+
6978
test_done

0 commit comments

Comments
 (0)