[PATCH v2] peel_onion(): add support for <rev>^{tag}
- From
- Richard Hansen <rhansen@bbn.com>
- Date
- Sep 2, 2013, 05:42 UTC
- Message-ID
- <1378100551-892-1-git-send-email-rhansen@bbn.com>
Complete the <rev>^{<type>} family of object specifiers 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 revisionSigned-off-by: Richard Hansen <rhansen@bbn.com> --- Changes since v1 (2013-06-18, see <http://thread.gmane.org/gmane.comp.version-control.git/228323>): * improved commit message * added usage note to gitrevisions[7]
Documentation/revisions.txt | 3 +++ sha1_name.c | 2 ++ 2 files changed, 5 insertions(+)
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index d477b3f..b3322ad 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -121,6 +121,9 @@ some output processing may assume ref names in UTF-8. object that exists, without requiring 'rev' to be a tag, and without dereferencing 'rev'; because a tag is already an object, it does not have to be dereferenced even once to get to an object. ++ +'rev{caret}\{tag\}' can be used to ensure that 'rev' identifies an +existing tag object. '<rev>{caret}\{\}', e.g. 'v0.99.8{caret}\{\}':: A suffix '{caret}' followed by an empty brace pair 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] == '}')
-- 1.8.4