Merge branch 'protocol-var'

Fixes #281 and fixes #278

Author: languitar

README.md

@@ -138,6 +138,8 @@ target=git-logins/${host}
 
 The above configuration directive will lead to any host that did not match any previous section in the ini file to being looked up under the `git-logins` directory in your password store.
 
+Apart from `${host}`, the variables `${username}` and `${protocol}` can be used for replacements.
+
 #### DEFAULT Section
 
 Defaults suitable for all entries of the mapping file can be specified in a special section of the configuration file named `[DEFAULT]`.

passgithelper.py

@@ -352,6 +352,8 @@ def define_pass_target(
     pass_target = section.get("target").replace("${host}", request["host"])
     if "username" in request:
         pass_target = pass_target.replace("${username}", request["username"])
+    if "protocol" in request:
+        pass_target = pass_target.replace("${protocol}", request["protocol"])
     return pass_target
 
 

test_data/wildcard/git-pass-mapping.ini

@@ -1,2 +1,2 @@
 [*]
-target=dev/${host}/${username}
+target=dev/${protocol}/${host}/${username}

test_passgithelper.py

@@ -263,7 +263,7 @@ def test_path_used_if_present(self, capsys: Any) -> None:
 username=wildcard
 path=subpath/bar.git""",
                 b"narf-wildcard",
-                "dev/wildcard.com/wildcard",
+                "dev/https/wildcard.com/wildcard",
             ),
         ],
         indirect=True,