diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 04:21:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 04:21:03 +0300 |
| commit | 8d958b97c6544cfd8ed8d7a6f47525910ea1b8fc (patch) | |
| tree | acfe85ca7f123dcef4e4bd5c9bb93aff15989165 /revision.c | |
| parent | aa5439d623ee297bc225f26c06981877f72ccf1b (diff) | |
| parent | a3ba6bf10abcaed1819d27fa45675c3a0e141f95 (diff) | |
Merge branch 'jk/ignore-broken-tags-when-ignoring-missing-links' into maint
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
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 7ff61ff5f7..67ebc6fc4b 100644 --- a/revision.c +++ b/revision.c @@ -230,7 +230,7 @@ static struct commit *handle_commit(struct rev_info *revs, die("bad tag"); object = parse_object(tag->tagged->oid.hash); if (!object) { - if (flags & UNINTERESTING) + if (revs->ignore_missing_links || (flags & UNINTERESTING)) return NULL; die("bad object %s", oid_to_hex(&tag->tagged->oid)); } |