[clone] When unpacking peeled refs, use the object that refers to the tag…

…and not the one that refers to the (usually) commit the tags points to. When declaring wants, it really wants to see tips first, it appears. Quite tricky

Sebastian Thiel committed 6 years ago

Commit fe8bb391 parent 7c8ecb73 files · +6 −4Browse files

Unified · Split

3 files

git-protocol/src/fetch/refs.rs +4 −2
git-protocol/tests/fetch/mod.rs +1 −1
gitoxide-core/src/pack/receive.rs +1 −1

git-protocol/src/fetch/refs.rs+4−2

 }
 impl Ref {
-    pub fn unpack_common(&self) -> (&BString, &owned::Id) {
+    /// Provide shared fields referring to the ref itself. In case of peeled refs, the tag object itself is returned as it is what
+    /// the path refers to.
+    pub fn unpack(&self) -> (&BString, &owned::Id) {
         match self {
             Ref::Direct { path, object, .. }
-            | Ref::Peeled { path, object, .. }
+            | Ref::Peeled { path, tag: object, .. } // the tag acts as reference
             | Ref::Symbolic { path, object, .. } => (path, object),
         }
     }

git-protocol/tests/fetch/mod.rs+1−1

@@ -16,7 +16,7 @@ struct CloneDelegate { · 15 unmodified lines
16	impl fetch::Delegate for CloneDelegate {	16	impl fetch::Delegate for CloneDelegate {
17	fn negotiate(&mut self, refs: &[Ref], arguments: &mut Arguments, _previous_result: Option<&Response>) -> Action {	17	fn negotiate(&mut self, refs: &[Ref], arguments: &mut Arguments, _previous_result: Option<&Response>) -> Action {
18	for r in refs {	18	for r in refs {
19	arguments.want(r.unpack_common().1.to_borrowed());	19	arguments.want(r.unpack().1.to_borrowed());
20	}	20	}
21	Action::Close	21	Action::Close
22	}	22	}

gitoxide-core/src/pack/receive.rs+1−1

@@ -20,7 +20,7 @@ struct CloneDelegate<W: io::Write> { · 19 unmodified lines
20	impl<W: io::Write> git_protocol::fetch::Delegate for CloneDelegate<W> {	20	impl<W: io::Write> git_protocol::fetch::Delegate for CloneDelegate<W> {
21	fn negotiate(&mut self, refs: &[Ref], arguments: &mut Arguments, _previous: Option<&Response>) -> Action {	21	fn negotiate(&mut self, refs: &[Ref], arguments: &mut Arguments, _previous: Option<&Response>) -> Action {
22	for r in refs {	22	for r in refs {
23	arguments.want(r.unpack_common().1.to_borrowed());	23	arguments.want(r.unpack().1.to_borrowed());
24	}	24	}
25	Action::Close	25	Action::Close
26	}	26	}