Merge branch 'dt/fsck-verify-pack-error'

The exit code of git-fsck didnot reflect some types of errors found
in packed objects, which has been corrected.

* dt/fsck-verify-pack-error:
  verify_pack: do not ignore return value of verification function
This commit is contained in:
Junio C Hamano 2015-12-10 12:36:12 -08:00
Родитель 9eb2449c35 8c24d832cd
Коммит b12a966eff
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -126,7 +126,7 @@ static int verify_packfile(struct packed_git *p,
sha1_to_hex(entries[i].sha1), p->pack_name); sha1_to_hex(entries[i].sha1), p->pack_name);
else if (fn) { else if (fn) {
int eaten = 0; int eaten = 0;
fn(entries[i].sha1, type, size, data, &eaten); err |= fn(entries[i].sha1, type, size, data, &eaten);
if (eaten) if (eaten)
data = NULL; data = NULL;
} }