From d6eb885a3f205e00a3be9f2ae2e8f510cae15d8a Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Wed, 22 Mar 2023 14:23:24 +0100 Subject: just-mr: Add git binary option In the rare cases that we need to shell out to git, let the user configure what binary to use. Option resolves in the same way as the just executable, including allowing it to be set via just-mrrc. Updates all cases of shelling out to git (fetch and commit update). Update just-mr and just-mrrc docs accordingly. --- share/man/just-mr.1.org | 5 +++++ share/man/just-mrrc.5.org | 5 +++++ 2 files changed, 10 insertions(+) (limited to 'share') diff --git a/share/man/just-mr.1.org b/share/man/just-mr.1.org index e30fe682..a166353e 100644 --- a/share/man/just-mr.1.org +++ b/share/man/just-mr.1.org @@ -103,6 +103,11 @@ See *just-mr-repository-config(5)* for more details on the input format. Path to the just-mrrc file to use. See *just-mrrc(5)* for more details.\\ Default: file path ~".just-mrrc"~ in the user's home directory. + *--git* PATH\\ + Path to the git binary in ~PATH~ or path to the git binary. Used in the rare + instances when shelling out to git is needed.\\ + Default: ~"git"~.\\ + *--norc*\\ Option to prevent reading any *just-mrrc(5)* file. diff --git a/share/man/just-mrrc.5.org b/share/man/just-mrrc.5.org index c6396f56..07c28481 100644 --- a/share/man/just-mrrc.5.org +++ b/share/man/just-mrrc.5.org @@ -62,6 +62,10 @@ The just-mrrc is given by a JSON object. path to the ~just~ binary to use for execution, if ~just-mr~ is used as a launcher. +- The value for the key ~"git"~ is a single location object, specifying the + path to the git binary to use in the instances when ~just-mr~ needs to shell + out. + - The value for the key ~"local launcher"~, if given, is list of strings setting the default for local launcher for ~just-mr~; command-line arguments take precedence over the value in the @@ -99,6 +103,7 @@ An example just-mrrc file could look like the following: , "log files": [{"root": "home", "path": ".log/just/latest-invocation"}] , "distdirs": [{"root": "home", "path": ".distfiles"}] , "just": {"root": "system", "path": "usr/bin/just"} +, "git": {"root": "system", "path": "usr/bin/git"} , "just args": { "build": ["-r", "10.0.0.1:8980", "--remote-execution-property", "OS:Linux"] , "install": ["-r", "10.0.0.1:8980", "--remote-execution-property", "OS:Linux"] -- cgit v1.2.3