change!: `fetch::Ref::unpack()` returns `Option<oid>`. (#450)

That way the caller has to be aware of the possibility of an unborn branch (probably the only unborn branch) on the remote.

Sebastian Thiel committed 4 years ago

Commit cd867ad1 parent 70861012 files · +7 −8Browse files

Unified · Split

2 files

     /// In case of peeled refs, the tag object itself is returned as it is what the ref directly refers to, and target of the tag is returned
     /// as `peeled`.
     /// If `unborn`, the first object id will be the null oid.
-    pub fn unpack(&self) -> (&BStr, &git_hash::oid, Option<&git_hash::oid>) {
+    pub fn unpack(&self) -> (&BStr, Option<&git_hash::oid>, Option<&git_hash::oid>) {
         match self {
             Ref::Direct { full_ref_name, object }
             | Ref::Symbolic {
                 full_ref_name, object, ..
-            } => (full_ref_name.as_ref(), object, None),
+            } => (full_ref_name.as_ref(), Some(object), None),
             Ref::Peeled {
                 full_ref_name,
                 tag: object,
                 object: peeled,
-            } => (full_ref_name.as_ref(), object, Some(peeled)),
+            } => (full_ref_name.as_ref(), Some(object), Some(peeled)),
-            Ref::Unborn { target: _ } => {
+            Ref::Unborn { target: _ } => ("HEAD".into(), None, None),
-                static NULL: git_hash::ObjectId = git_hash::ObjectId::null(git_hash::Kind::Sha1);
-                ("HEAD".into(), &NULL, None)
-            }
         }
     }
 }

         _previous_response: Option<&Response>,
     ) -> io::Result<Action> {
         for r in refs {
-            arguments.want(r.unpack().1);
+            if let Some(id) = r.unpack().1 {
+                arguments.want(id);
+            }
         }
         Ok(Action::Cancel)
     }