Return the number of fetched commits

herostratus/src/commands/check.rs

@@ -21,7 +21,7 @@ pub fn check(args: &CheckArgs) -> eyre::Result<()> {
 
 pub fn check_all(args: &CheckAllArgs, config: &Config, data_dir: &Path) -> eyre::Result<()> {
     if !args.no_fetch {
-        crate::commands::fetch_all(&args.into(), config, data_dir)?
+        let _fetched = crate::commands::fetch_all(&args.into(), config, data_dir)?;
     }
 
     tracing::info!("Checking repositories ...");

herostratus/src/commands/fetch_all.rs

@@ -5,9 +5,10 @@ use crate::cli::FetchAllArgs;
 use crate::config::Config;
 use crate::git::clone::{clone_repository, fetch_remote, find_local_repository};
 
-pub fn fetch_all(_args: &FetchAllArgs, config: &Config, _data_dir: &Path) -> eyre::Result<()> {
+pub fn fetch_all(_args: &FetchAllArgs, config: &Config, _data_dir: &Path) -> eyre::Result<usize> {
     tracing::info!("Fetching repositories ...");
     let start = Instant::now();
+    let mut fetched_commits = 0;
     for (name, config) in config.repositories.iter() {
         let span = tracing::debug_span!("fetch", name = name);
         let _enter = span.enter();
@@ -27,7 +28,7 @@ pub fn fetch_all(_args: &FetchAllArgs, config: &Config, _data_dir: &Path) -> eyr
         };
 
         if !skip_fetch {
-            fetch_remote(config, &repo)?
+            fetched_commits += fetch_remote(config, &repo)?
         }
     }
     tracing::info!(
@@ -36,5 +37,5 @@ pub fn fetch_all(_args: &FetchAllArgs, config: &Config, _data_dir: &Path) -> eyr
         start.elapsed()
     );
 
-    Ok(())
+    Ok(fetched_commits)
 }

herostratus/src/git/clone.rs

@@ -118,8 +118,13 @@ fn fetch_options(config: &crate::config::RepositoryConfig) -> git2::FetchOptions
 pub fn fetch_remote(
     config: &crate::config::RepositoryConfig,
     repo: &git2::Repository,
-) -> eyre::Result<()> {
+) -> eyre::Result<usize> {
     let mut remote = repo.find_remote("origin")?;
+    assert_eq!(
+        remote.url().unwrap_or_default(),
+        config.url.as_str(),
+        "RepositoryConfig and remote 'origin' don't agree on the URL"
+    );
     let reference_name = config.branch.as_deref().unwrap_or("HEAD");
     // If this is the first time this reference is being fetched, fetch it like
     //     git fetch origin branch:branch
@@ -145,11 +150,11 @@ pub fn fetch_remote(
     let reference = repo.resolve_reference_from_short_name(reference_name)?;
     let after = reference.peel_to_commit()?;
 
+    let mut new_commits: usize = 0;
     if before.is_some() && before.as_ref().unwrap().id() == after.id() {
         tracing::debug!("... done. No new commits");
     } else {
         let commits = crate::git::rev::walk(after.id(), repo)?;
-        let mut new_commits: usize = 0;
         for commit_id in commits {
             if let Some(before) = &before {
                 if commit_id? == before.id() {
@@ -161,7 +166,7 @@ pub fn fetch_remote(
         tracing::debug!("... done. {new_commits} new commits");
     }
 
-    Ok(())
+    Ok(new_commits)
 }
 
 pub fn clone_repository(