diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-09-04 09:24:29 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-09-04 09:24:29 +0400 |
commit | 306d7e5556f45c7405190b8b170e7ceefc88b9fa (patch) | |
tree | af0a806df0d64ff5197e32273d7374f9ca534943 /t | |
parent | c208e05bd9880028c980fafbc5dda3d17a603ac1 (diff) | |
parent | ba9eab7bfdcb83ad67f4714507599f378a91b17a (diff) |
Merge branch 'js/maint-reflog-beyond-horizon'
* js/maint-reflog-beyond-horizon:
t1503: fix broken test_must_fail calls
rev-parse: tests git rev-parse --verify master@{n}, for various n
sha1_name.c: use warning in preference to fprintf(stderr
rev-parse: exit with non-zero status if ref@{n} is not valid.
Diffstat (limited to 't')
-rwxr-xr-x | t/t1503-rev-parse-verify.sh | 11 | ||||
-rwxr-xr-x | 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 cc65394947..100f857b16 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 af721f9719..0eeeb0e450 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 |