adapt to changes in git-repository

Author: Byron

gitoxide-core/src/repository/clone.rs

@@ -67,7 +67,7 @@ pub(crate) mod function {
         }
 
         match fetch_outcome.status {
-            Status::NoChange => {
+            Status::NoPackReceived { .. } => {
                 unreachable!("clone always has changes")
             }
             Status::DryRun { .. } => unreachable!("dry-run unsupported"),

gitoxide-core/src/repository/fetch.rs

@@ -60,16 +60,8 @@ pub(crate) mod function {
 
         let ref_specs = remote.refspecs(git::remote::Direction::Fetch);
         match res.status {
-            Status::NoChange => {
-                let show_unmapped = false;
-                crate::repository::remote::refs::print_refmap(
-                    &repo,
-                    ref_specs,
-                    res.ref_map,
-                    show_unmapped,
-                    &mut out,
-                    err,
-                )
+            Status::NoPackReceived { update_refs } => {
+                print_updates(&repo, update_refs, ref_specs, res.ref_map, &mut out, err)
             }
             Status::DryRun { update_refs } => print_updates(&repo, update_refs, ref_specs, res.ref_map, &mut out, err),
             Status::Change {
@@ -100,9 +92,9 @@ pub(crate) mod function {
         mut out: impl std::io::Write,
         mut err: impl std::io::Write,
     ) -> anyhow::Result<()> {
-        let mut last_spec_index = usize::MAX;
+        let mut last_spec_index = git::remote::fetch::SpecIndex::ExplicitInRemote(usize::MAX);
         let mut updates = update_refs
-            .iter_mapping_updates(&map.mappings, refspecs)
+            .iter_mapping_updates(&map.mappings, refspecs, &map.extra_refspecs)
             .filter_map(|(update, mapping, spec, edit)| spec.map(|spec| (update, mapping, spec, edit)))
             .collect::<Vec<_>>();
         updates.sort_by_key(|t| t.2);

gitoxide-core/src/repository/remote.rs

@@ -32,7 +32,7 @@ mod refs_impl {
             pub handshake_info: bool,
         }
 
-        pub(crate) use super::{print, print_ref, print_refmap};
+        pub(crate) use super::{print, print_ref};
     }
 
     #[git::protocol::maybe_async::maybe_async]
@@ -116,12 +116,15 @@ mod refs_impl {
         mut out: impl std::io::Write,
         mut err: impl std::io::Write,
     ) -> anyhow::Result<()> {
-        let mut last_spec_index = usize::MAX;
+        let mut last_spec_index = git::remote::fetch::SpecIndex::ExplicitInRemote(usize::MAX);
         map.mappings.sort_by_key(|m| m.spec_index);
         for mapping in &map.mappings {
             if mapping.spec_index != last_spec_index {
                 last_spec_index = mapping.spec_index;
-                let spec = &refspecs[mapping.spec_index];
+                let spec = mapping
+                    .spec_index
+                    .get(refspecs, &map.extra_refspecs)
+                    .expect("refspecs here are the ones used for mapping");
                 spec.to_ref().write_to(&mut out)?;
                 writeln!(out)?;
             }

tests/snapshots/plumbing/no-repo/pack/receive/file-v-any-no-output-single-ref

@@ -1,2 +1,2 @@
-index: c787de2aafb897417ca8167baeb146eabd18bc5f
-pack: 346574b7331dc3a1724da218d622c6e1b6c66a57
+index: 3ff97f80d63a1261147ace4cb06191a2fd686ff6
+pack: de6c8d1e0ca3ee9331a3f92da74add15abd03049