mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/pack-bitmap'

Browse Source 
* jk/pack-bitmap:
  pack-objects: do not reuse packfiles without --delta-base-offset
  add `ignore_missing_links` mode to revwalk
This commit is contained in:
Junio C Hamano
2014-04-08 12:00:32 -07:00
parent d59c12d7ad 69e4b3426a
commit 967f8c9184
6 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
revision.c
View File

@ -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)) {