diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-29 06:34:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-29 06:34:54 +0300 |
| commit | b42b41b75ac686a8a25e2c99779ff4efd6719ca2 (patch) | |
| tree | 78d1d6a5dd7d4c34651c03125d4bedcd91040816 /revision.c | |
| parent | 69b050eeb8e6a7dceec1de4ab6e974d1787def9f (diff) | |
| parent | a3ba6bf10abcaed1819d27fa45675c3a0e141f95 (diff) | |
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
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 9c67cb6026..b023945309 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); if (!object) { - if (flags & UNINTERESTING) + if (revs->ignore_missing_links || (flags & UNINTERESTING)) return NULL; die("bad object %s", oid_to_hex(&tag->tagged->oid)); } |