From c23a457e72abe608715ac76f076f47dc42af07a5 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 30 May 2024 20:31:44 +0200
Subject: Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 vendor/gix-credentials/src/program/mod.rs | 42 ++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'vendor/gix-credentials/src/program')

diff --git a/vendor/gix-credentials/src/program/mod.rs b/vendor/gix-credentials/src/program/mod.rs
index e13e0a5ec..801466018 100644
--- a/vendor/gix-credentials/src/program/mod.rs
+++ b/vendor/gix-credentials/src/program/mod.rs
@@ -39,29 +39,31 @@ impl Program {
     /// Parse the given input as per the custom helper definition, supporting `!<script>`, `name` and `/absolute/name`, the latter two
     /// also support arguments which are ignored here.
     pub fn from_custom_definition(input: impl Into<BString>) -> Self {
-        let mut input = input.into();
-        let kind = if input.starts_with(b"!") {
-            input.remove(0);
-            Kind::ExternalShellScript(input)
-        } else {
-            let path = gix_path::from_bstr(
-                input
-                    .find_byte(b' ')
-                    .map_or(input.as_slice(), |pos| &input[..pos])
-                    .as_bstr(),
-            );
-            if gix_path::is_absolute(path) {
-                Kind::ExternalPath { path_and_args: input }
+        fn from_custom_definition_inner(mut input: BString) -> Program {
+            let kind = if input.starts_with(b"!") {
+                input.remove(0);
+                Kind::ExternalShellScript(input)
             } else {
-                input.insert_str(0, "git credential-");
-                Kind::ExternalName { name_and_args: input }
+                let path = gix_path::from_bstr(
+                    input
+                        .find_byte(b' ')
+                        .map_or(input.as_slice(), |pos| &input[..pos])
+                        .as_bstr(),
+                );
+                if gix_path::is_absolute(path) {
+                    Kind::ExternalPath { path_and_args: input }
+                } else {
+                    input.insert_str(0, "git credential-");
+                    Kind::ExternalName { name_and_args: input }
+                }
+            };
+            Program {
+                kind,
+                child: None,
+                stderr: true,
             }
-        };
-        Program {
-            kind,
-            child: None,
-            stderr: true,
         }
+        from_custom_definition_inner(input.into())
     }
 }
 
-- 
cgit v1.2.3