Re: [PATCH v2] format-patch: introduce format.outputDirectory configuration

From: Eric Sunshine <hidden>
Date: 2016-06-15 23:05:24

On Fri, Jun 19, 2015 at 2:28 PM, Alexander Kuleshov
[off-list ref] wrote:

We can pass -o/--output-directory to the format-patch command to
store patches not in the working directory. This patch introduces
format.outputDirectory configuration option for same purpose.

The case of usage of this configuration option can be convinience

s/convinience/convenience/

to not pass everytime -o/--output-directory if an user has pattern

s/everytime/every time/

quoted hunk ↗ jump to hunk

to store all patches in the /patches directory for example.

The format.outputDirectory has lower priority than command line
option, so if user will set format.outputDirectory and pass the
command line option, a result will be stored in a directory that
passed to command line option.

Signed-off-by: Alexander Kuleshov <redacted>
---

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 0dac4e9..38ddd76 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt

@@ -57,7 +57,11 @@ The names of the output files are printed to standard
 output, unless the `--stdout` option is specified.

 If `-o` is specified, output files are created in <dir>.  Otherwise
-they are created in the current working directory.
+they are created in the current working directory. The default path
+can be set with the seting 'format.outputDirectory' configuration option.

s/seting/setting/ or s/seting//

+If `-o` is specified and 'format.outputDirectory' is set, output files
+will be stored in a <dir> that passed to `-o`. When 'format.outputDirectory'
+is set to get default behaviour back is to pass './' to the `-o`.

s/set/set,/

quoted hunk ↗ jump to hunk

 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

diff --git a/builtin/log.c b/builtin/log.c
index 78b3e2c..fc26360 100644
--- a/builtin/log.c
+++ b/builtin/log.c

@@ -688,6 +688,8 @@ enum {
        COVER_AUTO
 };

+static const char *config_output_directory = NULL;
+
 static int git_format_config(const char *var, const char *value, void *cb)
 {
        if (!strcmp(var, "format.headers")) {

@@ -758,6 +760,9 @@ static int git_format_config(const char *var, const char *value, void *cb)
                config_cover_letter = git_config_bool(var, value) ? COVER_ON : COVER_OFF;
                return 0;
        }
+       if (!strcmp(var, "format.outputdirectory")) {
+               return git_config_string(&config_output_directory, var, value);
+       }

Style: Unnecessary braces.

quoted hunk ↗ jump to hunk

        return git_log_config(var, value, cb);
 }

@@ -1368,6 +1373,9 @@ 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)
+               output_directory = config_output_directory;
+
        if (!use_stdout)
                output_directory = set_outdir(prefix, output_directory);
        else

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 890db11..613e2cc 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh

@@ -40,6 +40,24 @@ test_expect_success setup '

 '

+test_expect_success "format-patch format.outputDirectory option" '
+       git config format.outputDirectory "patches/" &&

If you're using test_config (which you do below), then drop the above
line and replace it with the test_config line.

+       git format-patch master..side &&
+       cnt=$(ls | wc -l) &&
+       test $cnt = 3 &&
+       test_config format.outputDirectory "patches/" &&
+       git config --unset format.outputDirectory

Move the test_config line to the top of the test and get rid of the
'git config --unset' line since test_config will unset the
configuration automatically.

+'
+
+test_expect_success "format-patch format.outputDirectory overwritten with -o" '
+       rm -rf "patches" &&
+       git config format.outputDirectory "patches/" &&

Ditto: Place test_config line here and get rid of above line.

+       git format-patch master..side -o "." &&
+       test_must_fail ls patches/ &&

Don't use test_must_fail for non-git commands. Instead, use '!'.
However, in this case, using:

    test_path_is_missing patches &&

would make the intent more clear.

+       test_config format.outputDirectory "patches/" &&
+       git config --unset format.outputDirectory

Ditto: Move test_config higher and drop 'git config --unset'.

+'
+
 test_expect_success "format-patch --ignore-if-in-upstream" '

        git format-patch --stdout master..side >patch0 &&
--
2.4.4.727.g5c3049e.dirty

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help