From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Hansen Subject: [PATCH v4] peel_onion(): add support for ^{tag} Date: Tue, 3 Sep 2013 15:50:16 -0400 Message-ID: <1378237816-28671-1-git-send-email-rhansen@bbn.com> Cc: peff@peff.net, sunshine@sunshineco.com, Richard Hansen To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Tue Sep 03 21:50:38 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VGwcX-00049a-Mo for gcvg-git-2@plane.gmane.org; Tue, 03 Sep 2013 21:50:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757167Ab3ICTue (ORCPT ); Tue, 3 Sep 2013 15:50:34 -0400 Received: from smtp.bbn.com ([128.33.1.81]:51956 "EHLO smtp.bbn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755173Ab3ICTud (ORCPT ); Tue, 3 Sep 2013 15:50:33 -0400 Received: from socket.bbn.com ([192.1.120.102]:59548) by smtp.bbn.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1VGwcM-000KvJ-4B; Tue, 03 Sep 2013 15:50:26 -0400 X-Submitted: to socket.bbn.com (Postfix) with ESMTPSA id CBD093FF72 X-Mailer: git-send-email 1.8.4 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Complete the ^{} family of object descriptors by having ^{tag} dereference 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 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 is a tag object by checking the output of 'git cat-file -t ', but: * users may expect ^{tag} to exist given that ^{commit}, ^{tree}, and ^{blob} all exist * this syntax is more convenient/natural in some circumstances Signed-off-by: Richard Hansen --- Changes from v3 (2013-09-03, see ): * Use Peff's simpler test case. Documentation/revisions.txt | 3 +++ sha1_name.c | 2 ++ t/t1511-rev-parse-caret.sh | 7 +++++++ 3 files changed, 12 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. '{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] == '}') diff --git a/t/t1511-rev-parse-caret.sh b/t/t1511-rev-parse-caret.sh index eaefc77..15973f2 100755 --- a/t/t1511-rev-parse-caret.sh +++ b/t/t1511-rev-parse-caret.sh @@ -54,6 +54,13 @@ test_expect_success 'ref^{tree}' ' 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 && -- 1.8.4