Merging upstream version 1.71.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 5 insertions, 4 deletions

diff --git a/vendor/gix-credentials/src/helper/invoke.rs b/vendor/gix-credentials/src/helper/invoke.rs
index a543ec761..563f3b2ff 100644
--- a/vendor/gix-credentials/src/helper/invoke.rs
+++ b/vendor/gix-credentials/src/helper/invoke.rs
@@ -8,8 +8,9 @@ impl Action {
         match self {
             Action::Get(ctx) => ctx.write_to(write),
             Action::Store(last) | Action::Erase(last) => {
-                write.write_all(last)?;
-                write.write_all(&[b'\n'])
+                write.write_all(last).ok();
+                write.write_all(&[b'\n']).ok();
+                Ok(())
             }
         }
     }
diff --git a/vendor/gix-credentials/src/protocol/context/serde.rs b/vendor/gix-credentials/src/protocol/context/serde.rs
index 964195263..f713cbf4c 100644
--- a/vendor/gix-credentials/src/protocol/context/serde.rs
+++ b/vendor/gix-credentials/src/protocol/context/serde.rs
@@ -21,7 +21,7 @@ mod write {
                 if let Some(value) = value {
                     validate(key, value.as_slice().into())
                         .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
-                    write_key(&mut out, key, value.as_ref())?;
+                    write_key(&mut out, key, value.as_ref()).ok();
                 }
             }
             for (key, value) in [
@@ -33,7 +33,7 @@ mod write {
                 if let Some(value) = value {
                     validate(key, value.as_str().into())
                         .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
-                    write_key(&mut out, key, value.as_bytes().as_bstr())?;
+                    write_key(&mut out, key, value.as_bytes().as_bstr()).ok();
                 }
             }
             Ok(())