Garmelon/tablejohn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix repo update choking on non-commit refs

Browse source
This commit is contained in:
Joscha 2023-08-05 01:39:00 +02:00
parent 1b8f3c9bc1
commit b26ab8feff
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/update.rs
View file

@ -4,7 +4,7 @@ use std::collections::HashSet;
use anyhow::anyhow; use anyhow::anyhow;
use futures::TryStreamExt; use futures::TryStreamExt;
use gix::{traverse::commit::Info, ObjectId, Repository}; use gix::{objs::Kind, traverse::commit::Info, ObjectId, Repository};
use sqlx::{prelude::*, SqliteConnection, SqlitePool}; use sqlx::{prelude::*, SqliteConnection, SqlitePool};
use tracing::{debug, debug_span, error, info, Instrument}; use tracing::{debug, debug_span, error, info, Instrument};
@ -58,13 +58,18 @@ fn get_new_commits_from_repo(
old: &HashSet<ObjectId>, old: &HashSet<ObjectId>,
) -> anyhow::Result<Vec<Info>> { ) -> anyhow::Result<Vec<Info>> {
// Collect all references starting with "refs" // Collect all references starting with "refs"
let mut all_references = vec![]; let mut all_references: Vec<ObjectId> = vec![];
for reference in repo.references()?.prefixed("refs")? { for reference in repo.references()?.prefixed("refs")? {
let id: ObjectId = reference let reference = reference.map_err(|e| anyhow!(e))?;
.map_err(|e| anyhow!(e))? let id = reference.into_fully_peeled_id()?;
.into_fully_peeled_id()?
.into(); // Some repos *cough*linuxkernel*cough* have refs that don't point to
all_references.push(id); // commits. This makes the rev walk choke and die. We don't want that.
if id.object()?.kind != Kind::Commit {
continue;
}
all_references.push(id.into());
} }
// Walk from those until hitting old references // Walk from those until hitting old references