summaryrefslogtreecommitdiff
path: root/tag.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-05 07:47:56 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-05 07:47:56 (GMT)
commit37fde874c2448ae2cd98abe24df2bd2a50aa2cda (patch)
tree840ddec7144dd152792bd982d584db01472cadc6 /tag.c
parentb03e2d2091153d239063cfc086a840d74a9eadde (diff)
downloadgit-37fde874c2448ae2cd98abe24df2bd2a50aa2cda.zip
git-37fde874c2448ae2cd98abe24df2bd2a50aa2cda.tar.gz
git-37fde874c2448ae2cd98abe24df2bd2a50aa2cda.tar.bz2
Fix send-pack for non-commitish tags.
Again I left the v2.6.11-tree tag behind. My bad. This commit makes sure that we do not barf when pushing a ref that is a non-commitish tag. You can update a remote ref under the following conditions: * You can always use --force. * Creating a brand new ref is OK. * If the remote ref is exactly the same as what you are pushing, it is OK (nothing is pushed). * You can replace a commitish with another commitish which is a descendant of it, if you can verify the ancestry between them; this and the above means you have to have what you are replacing. * Otherwise you cannot update; you need to use --force. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'tag.c')
-rw-r--r--tag.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/tag.c b/tag.c
index 2b25fc0..b1ab75f 100644
--- a/tag.c
+++ b/tag.c
@@ -3,6 +3,13 @@
const char *tag_type = "tag";
+struct object *deref_tag(struct object *o)
+{
+ while (o && o->type == tag_type)
+ o = parse_object(((struct tag *)o)->tagged->sha1);
+ return o;
+}
+
struct tag *lookup_tag(const unsigned char *sha1)
{
struct object *obj = lookup_object(sha1);