Merge branch 'header-field-multi-improve' of https://github.com/xmo-odoo/gitoxide into xmo-odoo-header-field-multi-improve

Author: Byron

git-object/src/commit/write.rs

@@ -1,7 +1,5 @@
 use std::io;
 
-use bstr::ByteSlice;
-
 use crate::{encode, encode::NL, Commit, CommitRef, Kind};
 
 impl crate::WriteTo for Commit {
@@ -17,12 +15,7 @@ impl crate::WriteTo for Commit {
             encode::header_field(b"encoding", encoding, &mut out)?;
         }
         for (name, value) in &self.extra_headers {
-            let has_newline = value.find_byte(b'\n').is_some();
-            if has_newline {
-                encode::header_field_multi_line(name, value, &mut out)?;
-            } else {
-                encode::trusted_header_field(name, value, &mut out)?;
-            }
+            encode::header_field_multi_line(name, value, &mut out)?;
         }
         out.write_all(NL)?;
         out.write_all(&self.message)
@@ -46,12 +39,7 @@ impl<'a> crate::WriteTo for CommitRef<'a> {
             encode::header_field(b"encoding", encoding, &mut out)?;
         }
         for (name, value) in &self.extra_headers {
-            let has_newline = value.find_byte(b'\n').is_some();
-            if has_newline {
-                encode::header_field_multi_line(name, value, &mut out)?;
-            } else {
-                encode::trusted_header_field(name, value, &mut out)?;
-            }
+            encode::header_field_multi_line(name, value, &mut out)?;
         }
         out.write_all(NL)?;
         out.write_all(self.message)

git-object/src/encode.rs

@@ -22,20 +22,13 @@ impl From<Error> for io::Error {
 }
 
 pub fn header_field_multi_line(name: &[u8], value: &[u8], mut out: impl io::Write) -> io::Result<()> {
-    let mut lines = value.as_bstr().lines();
-    trusted_header_field(name, lines.next().expect("non-empty value"), &mut out)?;
+    let mut lines = value.as_bstr().split_str(b"\n");
+    trusted_header_field(name, lines.next().ok_or(Error::EmptyValue)?, &mut out)?;
     for line in lines {
         out.write_all(SPACE)?;
         out.write_all(line)?;
         out.write_all(NL)?;
     }
-    // If the last line ended on a newline, we have to re-add it by force
-    if let Some(b) = value.last() {
-        if *b == b'\n' {
-            out.write_all(SPACE)?;
-            out.write_all(NL)?;
-        }
-    }
     Ok(())
 }