зеркало из https://github.com/microsoft/git.git
silence broken link warnings with revs->ignore_missing_links
We set revs->ignore_missing_links to instruct the revision-walking machinery that we know the history graph may be incomplete. For example, we use it when walking unreachable but recent objects; we want to add what we can, but it's OK if the history is incomplete. However, we still print error messages for the missing objects, which can be confusing. This is not an error, but just a normal situation when transitioning from a repository last pruned by an older git (which can leave broken segments of history) to a more recent one (where we try to preserve whole reachable segments). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
9cc2b07a7c
Коммит
daf7d86783
|
@ -81,7 +81,7 @@ static void process_tree(struct rev_info *revs,
|
|||
die("bad tree object");
|
||||
if (obj->flags & (UNINTERESTING | SEEN))
|
||||
return;
|
||||
if (parse_tree(tree) < 0) {
|
||||
if (parse_tree_gently(tree, revs->ignore_missing_links) < 0) {
|
||||
if (revs->ignore_missing_links)
|
||||
return;
|
||||
die("bad tree object %s", sha1_to_hex(obj->sha1));
|
||||
|
|
|
@ -834,7 +834,7 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
|
|||
for (parent = commit->parents; parent; parent = parent->next) {
|
||||
struct commit *p = parent->item;
|
||||
|
||||
if (parse_commit(p) < 0)
|
||||
if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
|
||||
return -1;
|
||||
if (revs->show_source && !p->util)
|
||||
p->util = commit->util;
|
||||
|
|
|
@ -129,4 +129,19 @@ for repack in '' true; do
|
|||
'
|
||||
done
|
||||
|
||||
test_expect_success 'do not complain about existing broken links' '
|
||||
cat >broken-commit <<-\EOF &&
|
||||
tree 0000000000000000000000000000000000000001
|
||||
parent 0000000000000000000000000000000000000002
|
||||
author whatever <whatever@example.com> 1234 -0000
|
||||
committer whatever <whatever@example.com> 1234 -0000
|
||||
|
||||
some message
|
||||
EOF
|
||||
commit=$(git hash-object -t commit -w broken-commit) &&
|
||||
git gc 2>stderr &&
|
||||
verbose git cat-file -e $commit &&
|
||||
test_must_be_empty stderr
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Загрузка…
Ссылка в новой задаче