diff options
| author | Richard Hansen <rhansen@bbn.com> | 2013-09-03 19:50:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-03 20:09:17 (GMT) |
| commit | 75aa26d34c4a80142512bd980a416b0fb30044c1 (patch) | |
| tree | 15871e0fb3d80909d16f9db8ef77108fb1c97d80 /sha1_name.c | |
| parent | e230c568c4b9a991e3175e5f65171a566fd8e39c (diff) | |
| download | git-75aa26d34c4a80142512bd980a416b0fb30044c1.zip git-75aa26d34c4a80142512bd980a416b0fb30044c1.tar.gz git-75aa26d34c4a80142512bd980a416b0fb30044c1.tar.bz2 | |
peel_onion(): add support for <rev>^{tag}
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}
04f013dc38d7512eadb915eba22efc414f18b869
$ 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>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sha1_name.c b/sha1_name.c index 65ad066..6dc496d 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -679,6 +679,8 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) sp++; /* beginning of type name, or closing brace for empty */ if (!strncmp(commit_type, sp, 6) && sp[6] == '}') expected_type = OBJ_COMMIT; + else if (!strncmp(tag_type, sp, 3) && sp[3] == '}') + expected_type = OBJ_TAG; else if (!strncmp(tree_type, sp, 4) && sp[4] == '}') expected_type = OBJ_TREE; else if (!strncmp(blob_type, sp, 4) && sp[4] == '}') |