From 37fde874c2448ae2cd98abe24df2bd2a50aa2cda Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 5 Aug 2005 00:47:56 -0700 Subject: 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 --- tag.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tag.c') diff --git a/tag.c b/tag.c index 2b25fc0e1d..b1ab75ff01 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); -- cgit v1.3