diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:33 -0700 |
| commit | 967f8c918465312cc6cc1bcbcfacafcf95152bd8 (patch) | |
| tree | 72882dba893944951e58755e1f7d6a753d555b98 /revision.c | |
| parent | Merge branch 'jl/nor-or-nand-and' (diff) | |
| parent | pack-objects: do not reuse packfiles without --delta-base-offset (diff) | |
| download | tgif-967f8c918465312cc6cc1bcbcfacafcf95152bd8.tar.xz | |
Merge branch 'jk/pack-bitmap'
* jk/pack-bitmap:
pack-objects: do not reuse packfiles without --delta-base-offset
add `ignore_missing_links` mode to revwalk
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/revision.c b/revision.c index 794a8835c0..71e2337423 100644 --- a/revision.c +++ b/revision.c @@ -2960,9 +2960,11 @@ static struct commit *get_revision_1(struct rev_info *revs) if (revs->max_age != -1 && (commit->date < revs->max_age)) continue; - if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) - die("Failed to traverse parents of commit %s", - sha1_to_hex(commit->object.sha1)); + if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) { + if (!revs->ignore_missing_links) + die("Failed to traverse parents of commit %s", + sha1_to_hex(commit->object.sha1)); + } } switch (simplify_commit(revs, commit)) { |