mirror of
https://github.com/git/git.git
synced 2024-10-31 14:27:54 +01:00
75aa26d34c
Complete the <rev>^{<type>} family of object descriptors by having
<rev>^{tag} dereference <rev> until a tag object is found (or fail if
unable).
At first glance this may not seem very useful, as commits, trees, and
blobs cannot be peeled to a tag, and a tag would just peel to itself.
However, this can be used to ensure that <rev> names a tag object:
$ git rev-parse --verify v1.8.4^{tag}
04f013dc38
$ git rev-parse --verify master^{tag}
error: master^{tag}: expected tag type, but the object dereferences to tree type
fatal: Needed a single revision
Users can already ensure that <rev> is a tag object by checking the
output of 'git cat-file -t <rev>', but:
* users may expect <rev>^{tag} to exist given that <rev>^{commit},
<rev>^{tree}, and <rev>^{blob} all exist
* this syntax is more convenient/natural in some circumstances
Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
80 lines
2 KiB
Bash
Executable file
80 lines
2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='tests for ref^{stuff}'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo blob >a-blob &&
|
|
git tag -a -m blob blob-tag `git hash-object -w a-blob` &&
|
|
mkdir a-tree &&
|
|
echo moreblobs >a-tree/another-blob &&
|
|
git add . &&
|
|
TREE_SHA1=`git write-tree` &&
|
|
git tag -a -m tree tree-tag "$TREE_SHA1" &&
|
|
git commit -m Initial &&
|
|
git tag -a -m commit commit-tag &&
|
|
git branch ref &&
|
|
git checkout master &&
|
|
echo modified >>a-blob &&
|
|
git add -u &&
|
|
git commit -m Modified
|
|
'
|
|
|
|
test_expect_success 'ref^{non-existent}' '
|
|
test_must_fail git rev-parse ref^{non-existent}
|
|
'
|
|
|
|
test_expect_success 'ref^{}' '
|
|
git rev-parse ref >expected &&
|
|
git rev-parse ref^{} >actual &&
|
|
test_cmp expected actual &&
|
|
git rev-parse commit-tag^{} >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'ref^{commit}' '
|
|
git rev-parse ref >expected &&
|
|
git rev-parse ref^{commit} >actual &&
|
|
test_cmp expected actual &&
|
|
git rev-parse commit-tag^{commit} >actual &&
|
|
test_cmp expected actual &&
|
|
test_must_fail git rev-parse tree-tag^{commit} &&
|
|
test_must_fail git rev-parse blob-tag^{commit}
|
|
'
|
|
|
|
test_expect_success 'ref^{tree}' '
|
|
echo $TREE_SHA1 >expected &&
|
|
git rev-parse ref^{tree} >actual &&
|
|
test_cmp expected actual &&
|
|
git rev-parse commit-tag^{tree} >actual &&
|
|
test_cmp expected actual &&
|
|
git rev-parse tree-tag^{tree} >actual &&
|
|
test_cmp expected actual &&
|
|
test_must_fail git rev-parse blob-tag^{tree}
|
|
'
|
|
|
|
test_expect_success 'ref^{tag}' '
|
|
test_must_fail git rev-parse HEAD^{tag} &&
|
|
git rev-parse commit-tag >expected &&
|
|
git rev-parse commit-tag^{tag} >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'ref^{/.}' '
|
|
git rev-parse master >expected &&
|
|
git rev-parse master^{/.} >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'ref^{/non-existent}' '
|
|
test_must_fail git rev-parse master^{/non-existent}
|
|
'
|
|
|
|
test_expect_success 'ref^{/Initial}' '
|
|
git rev-parse ref >expected &&
|
|
git rev-parse master^{/Initial} >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|