From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Stephen P. Smith" Subject: [PATCH v5] format-patch: introduce format.outputDirectory configuration Date: Tue, 12 Jan 2016 21:48:13 -0700 Message-ID: <1452660493-5430-1-git-send-email-ischis2@cox.net> References: Cc: Junio C Hamano , Eric Sunshine , Alexander Kuleshov , "Stephen P . Smith" To: Git Mailing List X-From: git-owner@vger.kernel.org Wed Jan 13 05:48:30 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aJDMD-00049o-7J for gcvg-git-2@plane.gmane.org; Wed, 13 Jan 2016 05:48:29 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754103AbcAMEsZ (ORCPT ); Tue, 12 Jan 2016 23:48:25 -0500 Received: from fed1rmfepo201.cox.net ([68.230.241.146]:34577 "EHLO fed1rmfepo201.cox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752610AbcAMEsY (ORCPT ); Tue, 12 Jan 2016 23:48:24 -0500 Received: from fed1rmimpo306 ([68.230.241.174]) by fed1rmfepo201.cox.net (InterMail vM.8.01.05.15 201-2260-151-145-20131218) with ESMTP id <20160113044823.SORR5597.fed1rmfepo201.cox.net@fed1rmimpo306> for ; Tue, 12 Jan 2016 23:48:23 -0500 Received: from thunderbird ([68.231.74.134]) by fed1rmimpo306 with cox id 5GoP1s0042tqoqC01GoPeY; Tue, 12 Jan 2016 23:48:23 -0500 X-CT-Class: Clean X-CT-Score: 0.00 X-CT-RefID: str=0001.0A020205.5695D717.007C,ss=1,re=0.000,fgs=0 X-CT-Spam: 0 X-Authority-Analysis: v=2.0 cv=LKq4tuq9 c=1 sm=1 a=/Rt4pg3TtX3KzfzhvVoEow==:17 a=kviXuzpPAAAA:8 a=7aQ_Q-yQQ-AA:10 a=pGLkceISAAAA:8 a=JSNQmZlDd7ZuTQoTR7oA:9 a=/Rt4pg3TtX3KzfzhvVoEow==:117 X-CM-Score: 0.00 Authentication-Results: cox.net; none Received: from thunderbird.smith.home (thunderbird [127.0.0.1]) by thunderbird (Postfix) with ESMTP id 6F69113F628; Tue, 12 Jan 2016 21:48:23 -0700 (MST) X-Mailer: git-send-email 2.7.0-rc2 In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Alexander Kuleshov We can pass -o/--output-directory to the format-patch command to store patches in some place other than the working directory. This patch introduces format.outputDirectory configuration option for same purpose. The case of usage of this configuration option can be convinience to not pass every time -o/--output-directory if an user has pattern 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 Signed-off-by: Stephen P. Smith --- Notes: Fixed bug which was found when moving the tests to the end of the script by removing the hardcoded expected count and replacing with a computation of the number of actual patches. Mailing list web interface is again not working; therefore, I don't have URLs for the earlier review comments. Documentation/config.txt | 4 ++++ Documentation/git-format-patch.txt | 6 +++++- builtin/log.c | 7 +++++++ t/t4014-format-patch.sh | 15 +++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index f617886..e92a0ee 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1243,6 +1243,10 @@ format.coverLetter:: format-patch is invoked, but in addition can be set to "auto", to generate a cover-letter only when there's more than one patch. +format.outputDirectory:: + Set a custom directory to store the resulting files instead of the + current working directory. + filter..clean:: The command which is used to convert the content of a worktree file to a blob upon checkin. See linkgit:gitattributes[5] for diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index e3cdaeb..64c2803 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 . 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 '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 .`. 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 e00cea7..679ff76 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -707,6 +707,8 @@ enum { COVER_AUTO }; +static const char *config_output_directory; + static int git_format_config(const char *var, const char *value, void *cb) { if (!strcmp(var, "format.headers")) { @@ -777,6 +779,8 @@ 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); return git_log_config(var, value, cb); } @@ -1391,6 +1395,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 646c475..3b99434 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1445,4 +1445,19 @@ test_expect_success 'From line has expected format' ' test_cmp from filtered ' +test_expect_success 'format-patch format.outputDirectory option' ' + test_config format.outputDirectory 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 -o overrides format.outputDirectory' ' + test_config format.outputDirectory patches && + rm -fr patches patchset && + git format-patch master..side -o patchset && + test_path_is_missing patches && + test_path_is_dir patchset +' + test_done -- 2.7.0-rc2