From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 May 2017 03:34:54 +0000 (+0900)
Subject: Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links'
X-Git-Tag: v2.14.0-rc0~150
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b42b41b75ac686a8a25e2c99779ff4efd6719ca2;p=thirdparty%2Fgit.git

Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links'

Tag objects, which are not reachable from any ref, that point at
missing objects were mishandled by "git gc" and friends (they
should silently be ignored instead)

* jk/ignore-broken-tags-when-ignoring-missing-links:
  revision.c: ignore broken tags with ignore_missing_links
---

b42b41b75ac686a8a25e2c99779ff4efd6719ca2
diff --cc revision.c
index 9c67cb6026,7d57d440a1..b023945309
--- a/revision.c
+++ b/revision.c
@@@ -228,9 -228,9 +228,9 @@@ static struct commit *handle_commit(str
  			add_pending_object(revs, object, tag->tag);
  		if (!tag->tagged)
  			die("bad tag");
 -		object = parse_object(tag->tagged->oid.hash);
 +		object = parse_object(&tag->tagged->oid);
  		if (!object) {
- 			if (flags & UNINTERESTING)
+ 			if (revs->ignore_missing_links || (flags & UNINTERESTING))
  				return NULL;
  			die("bad object %s", oid_to_hex(&tag->tagged->oid));
  		}