refactor

- make the test more specific to what it's testing
- fix a bug in the way multi-line headers are written so the object can be serialised.

Author: Byron

gix-object/src/encode.rs

@@ -38,7 +38,9 @@ pub(crate) fn header_field_multi_line(name: &[u8], value: &[u8], out: &mut dyn i
     let mut lines = value.as_bstr().lines_with_terminator();
     out.write_all(name)?;
     out.write_all(SPACE)?;
-    out.write_all(lines.next().ok_or(Error::EmptyValue)?)?;
+    if let Some(line) = lines.next() {
+        out.write_all(line)?;
+    }
     for line in lines {
         out.write_all(SPACE)?;
         out.write_all(line)?;

gix-object/tests/object/commit/from_bytes.rs

@@ -1,10 +1,10 @@
 use gix_actor::SignatureRef;
-use gix_object::{bstr::ByteSlice, commit::message::body::TrailerRef, CommitRef};
+use gix_object::{bstr::ByteSlice, commit::message::body::TrailerRef, CommitRef, WriteTo};
 use smallvec::SmallVec;
 
 use crate::{
     commit::{LONG_MESSAGE, MERGE_TAG, SIGNATURE},
-    fixture_name, linus_signature, signature,
+    fixture_name, hex_to_id, linus_signature, signature,
 };
 
 #[test]
@@ -347,15 +347,22 @@ fn newline_right_after_signature_multiline_header() -> crate::Result {
 fn bogus_multi_gpgsig_header() -> crate::Result {
     let fixture = fixture_name("commit", "bogus-gpgsig-lines-in-git.git.txt");
     let commit = CommitRef::from_bytes(&fixture)?;
-    let pgp_sig = crate::commit::BEGIN_PGP_SIGNATURE.as_bstr();
-    assert_eq!(commit.extra_headers[0].1.as_ref(), pgp_sig);
+    let pgp_sig = b"-----BEGIN PGP SIGNATURE-----".as_bstr();
     assert_eq!(commit.extra_headers().pgp_signature(), Some(pgp_sig));
     assert_eq!(
-        commit.extra_headers().find(gix_object::commit::SIGNATURE_FIELD_NAME),
-        Some(pgp_sig)
+        commit.extra_headers().find_all("gpgsig").count(),
+        17,
+        "Each signature header line is prefixed with `gpgsig` here, so we parse it as extra header"
     );
-    assert_eq!(commit.extra_headers().find_pos("gpgsig"), Some(0));
-    assert_eq!(commit.extra_headers().find_pos("something else"), None);
     assert!(commit.message.starts_with(b"pretty: %G[?GS] placeholders"));
+
+    let mut buf = Vec::<u8>::new();
+    commit.write_to(&mut buf)?;
+    let actual = gix_object::compute_hash(gix_hash::Kind::Sha1, gix_object::Kind::Commit, &buf)?;
+    assert_eq!(
+        actual,
+        hex_to_id("5f549aa2f78314ac37bbd436c8f80aea4c752e07"),
+        "round-tripping works despite the strangeness"
+    );
     Ok(())
 }

gix-object/tests/object/commit/mod.rs

@@ -149,8 +149,6 @@ iyBBl69jASy41Ug/BlFJbw4+ItkShpXwkJKuBBV/JExChmvbxYWaS7QnyYC9UO0=
 
 ";
 
-const BEGIN_PGP_SIGNATURE: &[u8] = b"-----BEGIN PGP SIGNATURE-----";
-
 mod method {
     use gix_object::CommitRef;
     use pretty_assertions::assert_eq;