summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Richard Hansen <rhansen@bbn.com>2013-09-03 15:50:16 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-03 13:09:17 -0700
commit75aa26d34c4a80142512bd980a416b0fb30044c1 (patch)
tree15871e0fb3d80909d16f9db8ef77108fb1c97d80 /mergetools/tortoisemerge
parentGit 1.8.4 (diff)
downloadtgif-75aa26d34c4a80142512bd980a416b0fb30044c1.tar.xz
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 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions