@matheusbsbs / matheus-bagliano / commits / 75aa26d34c

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>

Richard Hansen committed Sep 3, 2013 at 15:50 UTC 75aa26d34c4a80142512bd980a416b0fb30044c1

3 files changed +12

Documentation/revisions.txt

@@ -121,6 +121,9 @@ some output processing may assume ref names in UTF-8.

121 object that exists, without requiring 'rev' to be a tag, and

122 without dereferencing 'rev'; because a tag is already an object,

123 it does not have to be dereferenced even once to get to an object.

124 ++

125 +'rev{caret}\{tag\}' can be used to ensure that 'rev' identifies an

126 +existing tag object.

127

128 '<rev>{caret}\{\}', e.g. 'v0.99.8{caret}\{\}'::

129 A suffix '{caret}' followed by an empty brace pair

sha1_name.c

@@ -679,6 +679,8 @@ static int peel_onion(const char *name, int len, unsigned char *sha1)

679 sp++; /* beginning of type name, or closing brace for empty */

680 if (!strncmp(commit_type, sp, 6) && sp[6] == '}')

681 expected_type = OBJ_COMMIT;

682 + else if (!strncmp(tag_type, sp, 3) && sp[3] == '}')

683 + expected_type = OBJ_TAG;

684 else if (!strncmp(tree_type, sp, 4) && sp[4] == '}')

685 expected_type = OBJ_TREE;

686 else if (!strncmp(blob_type, sp, 4) && sp[4] == '}')

t/t1511-rev-parse-caret.sh

@@ -54,6 +54,13 @@ test_expect_success 'ref^{tree}' '

54 test_must_fail git rev-parse blob-tag^{tree}

55 '

57 +test_expect_success 'ref^{tag}' '

58 + test_must_fail git rev-parse HEAD^{tag} &&

59 + git rev-parse commit-tag >expected &&

60 + git rev-parse commit-tag^{tag} >actual &&

61 + test_cmp expected actual

62 +'

63 +

64 test_expect_success 'ref^{/.}' '

65 git rev-parse master >expected &&

66 git rev-parse master^{/.} >actual &&