@@ -82,6 +82,11 @@ format.outputDirectory::
Set a custom directory to store the resulting files instead of the
current working directory. All directory components will be created.
+format.outputDirectoryCmd::
+ The command which is used to name a custom directory to store the
+ resulting files instead of the current working directory. All directory
+ components will be created.
+
format.useAutoBase::
A boolean value which lets you enable the `--base=auto` option of
format-patch by default.
@@ -67,7 +67,11 @@ can be set with the `format.outputDirectory` configuration option.
The `-o` option takes precedence over `format.outputDirectory`.
To store patches in the current working directory even when
`format.outputDirectory` points elsewhere, use `-o .`. All directory
-components will be created.
+components will be created. The 'format.outputDirectoryCmd' configuration can
+be used to name a command to produce the directory name programmatically. The
+command should produce the name to its standard output. The
+`format.outputDirectory` configuration takes precedence over
+`format.outputDirectoryCmd`.
By default, the subject of a single patch is "[PATCH] " followed by
the concatenation of lines from the commit message up to the first blank
@@ -774,6 +774,7 @@ static const char *signature = git_version_string;
static const char *signature_file;
static int config_cover_letter;
static const char *config_output_directory;
+static const char *config_output_directory_cmd;
enum {
COVER_UNSET,
@@ -856,6 +857,8 @@ static int git_format_config(const char *var, const char *value, void *cb)
}
if (!strcmp(var, "format.outputdirectory"))
return git_config_string(&config_output_directory, var, value);
+ if (!strcmp(var, "format.outputdirectorycmd"))
+ return git_config_string(&config_output_directory_cmd, var, value);
if (!strcmp(var, "format.useautobase")) {
base_auto = git_config_bool(var, value);
return 0;
@@ -1756,8 +1759,27 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (rev.show_notes)
init_display_notes(&rev.notes_opt);
- if (!output_directory && !use_stdout)
+ if (!output_directory && !use_stdout) {
+ // outputDirectoryCmd can be preceeded by outputDirectory
+ if (!config_output_directory && config_output_directory_cmd) {
+ struct child_process cp = CHILD_PROCESS_INIT;
+ const char *argv[1];
+ struct strbuf buf = STRBUF_INIT;
+ int rc;
+
+ argv[0] = config_output_directory_cmd;
+ cp.argv = argv;
+ cp.use_shell = 1;
+ rc = capture_command(&cp, &buf, PATH_MAX);
+ if (rc)
+ die(_("outputDirectoryCmd command failed: "
+ "'%s'"), config_output_directory_cmd);
+ strbuf_setlen(&buf, strcspn(buf.buf, "\r\n"));
+ config_output_directory = strbuf_detach(&buf, NULL);
+ }
+
output_directory = config_output_directory;
+ }
if (!use_stdout)
output_directory = set_outdir(prefix, output_directory);
@@ -1664,6 +1664,30 @@ test_expect_success 'format-patch -o overrides format.outputDirectory' '
test_path_is_dir patchset
'
+test_expect_success 'format-patch format.outputDirectoryCmd option' '
+ test_config format.outputDirectoryCmd "echo patches" &&
+ rm -fr patches &&
+ git format-patch master..side &&
+ test $(git rev-list master..side | wc -l) -eq $(ls patches | wc -l)
+'
+
+test_expect_success 'format-patch format.outputDirectory overrides format.outputDirectoryCmd' '
+ test_config format.outputDirectoryCmd "echo patches" &&
+ test_config format.outputDirectory patchset &&
+ rm -fr patches patchset &&
+ git format-patch master..side &&
+ test_path_is_missing patches &&
+ test_path_is_dir patchset
+'
+
+test_expect_success 'format-patch -o overrides format.outputDirectoryCmd' '
+ test_config format.outputDirectoryCmd "echo patches" &&
+ rm -fr patches patchset &&
+ git format-patch -o patchset master..side &&
+ test_path_is_missing patches &&
+ test_path_is_dir patchset
+'
+
test_expect_success 'format-patch --base' '
git checkout patchid &&
git format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual1 &&
Having 'format.outputDirectory' is convenient, but being able to process all produced patches via a wildcard command is even more so. I.e., using an argument like '<dir>/*'. Neither '-o' nor 'format.outputDirectory' can be parameterized to produce a new unique directory. Thus provide the new 'format.outputDirectoryCmd' configuration to specify a command which does the job and puts the name to standard output. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> --- Cc: Alexander Kuleshov <kuleshovmail@gmail.com> Cc: Eric Sunshine <sunshine@sunshineco.com> --- Documentation/config/format.txt | 5 +++++ Documentation/git-format-patch.txt | 6 +++++- builtin/log.c | 24 +++++++++++++++++++++++- t/t4014-format-patch.sh | 24 ++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 2 deletions(-)