From patchwork Fri Oct 11 08:36:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bert Wesarg X-Patchwork-Id: 11185023 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2467A1668 for ; Fri, 11 Oct 2019 08:36:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EFE352196E for ; Fri, 11 Oct 2019 08:36:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="Tzsyk+YW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726603AbfJKIgr (ORCPT ); Fri, 11 Oct 2019 04:36:47 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39996 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726310AbfJKIgq (ORCPT ); Fri, 11 Oct 2019 04:36:46 -0400 Received: by mail-wr1-f66.google.com with SMTP id h4so10902608wrv.7 for ; Fri, 11 Oct 2019 01:36:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fA2/E8HHC+cpK3GTSbSesZItRx+MnJHZzV0+oKp6okY=; b=Tzsyk+YWLX2tja4c5GoFOtX2WjWUiKDTGfXtwN3JkrZteHeFEf4oJ80mF2uHjq53FU ARL6kBVfoIe580TCkCyzXd4bgG2/J6gViS92oinm1JoohbI7Qyj1gCgak29sLsNJfdew 6tiNNVSOZ9KQeb92y7Mk8s6VA4zmh88lP+pjzHLjcrVrjeVJLAzTAQmvJW1DOP9ipXVK mNi1vpiepgzKpbhGtJLvAP5Hqh61AGiCgwzi8IfiXVqkQECzpTIAMs5t0N7R2PIGwKEk c0s6400333UDUkkP+dgjGbbDkFVcftJn14wjnH7GQifDVFZwpCgeomVQ7IAcIhHFikoQ TEDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fA2/E8HHC+cpK3GTSbSesZItRx+MnJHZzV0+oKp6okY=; b=ekd/1X3EAiGCXDzpl4So8q1/Vn0vY8epW4RjR4kVpUTShL8DuNYZQu/fvJYHUCwSCI voUIJHyexJ71FDlcif1U0pttz0UX4ZARtUN7RSBckUB/F2TxCA2XZ6S7R/pD9mAKq3HX jdyp86jyQ1O3G51sIVEPeYXpfoTi1ImLZ3eMq2tMNZJR7BazIjEXgJWN8dq3tIVUn3F3 qGAKH329i3sNnoveBuwR3UHA9dXsuuhJ+gkuTPC9k/CiRngNBjHqDF3mDeGfIZyouxiJ Lt5DdOYB2M2x33l+2pGQHdy70w/W66TB2Clha9TWj9z0qRLQYuCs65MsxDS5EDq25AaP tE7g== X-Gm-Message-State: APjAAAV7YmaSWOPl9XW1AIdL95injCn7ujCu6A9wRzoe8gDpQ6l5cCVX JrK25Mxs7K+nfx2UkJQ= X-Google-Smtp-Source: APXvYqxNSIOERRMKNEo95LT32ARt9WpAwvL62Qh1onRAec/rZb+TQMp/JX5eMsf1U+HO8M/BSCrsbw== X-Received: by 2002:a5d:4341:: with SMTP id u1mr12332225wrr.306.1570783003623; Fri, 11 Oct 2019 01:36:43 -0700 (PDT) Received: from localhost (m221.zih.tu-dresden.de. [141.30.68.221]) by smtp.gmail.com with ESMTPSA id b7sm9697234wrx.56.2019.10.11.01.36.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Oct 2019 01:36:43 -0700 (PDT) From: Bert Wesarg To: git@vger.kernel.org Cc: Bert Wesarg , Denton Liu , Junio C Hamano , =?utf-8?q?SZEDER_G=C3=A1bor?= Subject: [PATCH v4 1/2] format-patch: create leading components of output directory Date: Fri, 11 Oct 2019 10:36:41 +0200 Message-Id: X-Mailer: git-send-email 2.23.0.13.g28bc381d7c MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 'git format-patch -o ' did an equivalent of 'mkdir ' not 'mkdir -p ', which is being corrected. Avoid the usage of 'adjust_shared_perm' on the leading directories which may have security implications. Achieved by temporarily disabling of 'config.sharedRepository' like 'git init' does. Signed-off-by: Bert Wesarg --- Changes in v2: * squashed and base new tests on 'dl/format-patch-doc-test-cleanup' Changes in v3: * avoid applying adjust_shared_perm Changes in v4: * based on dl/format-patch-doc-test-cleanup and adopt it Cc: Denton Liu Cc: Junio C Hamano Cc: SZEDER Gábor --- Documentation/config/format.txt | 2 +- Documentation/git-format-patch.txt | 3 ++- builtin/log.c | 16 ++++++++++++++++ t/t4014-format-patch.sh | 23 +++++++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt index cb629fa769..40cad9278f 100644 --- a/Documentation/config/format.txt +++ b/Documentation/config/format.txt @@ -81,7 +81,7 @@ format.coverLetter:: format.outputDirectory:: Set a custom directory to store the resulting files instead of the - current working directory. + current working directory. All directory components will be created. format.useAutoBase:: A boolean value which lets you enable the `--base=auto` option of diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 0ac56f4b70..2035d4d5d5 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -66,7 +66,8 @@ 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 .`. +`format.outputDirectory` points elsewhere, use `-o .`. All directory +components will be created. 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 44b10b3415..8d08632858 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1765,10 +1765,26 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) setup_pager(); if (output_directory) { + int saved; if (rev.diffopt.use_color != GIT_COLOR_ALWAYS) rev.diffopt.use_color = GIT_COLOR_NEVER; if (use_stdout) die(_("standard output, or directory, which one?")); + /* + * We consider as 'outside of gitdir', therefore avoid + * applying adjust_shared_perm in s-c-l-d. + */ + saved = get_shared_repository(); + set_shared_repository(0); + switch (safe_create_leading_directories_const(output_directory)) { + case SCLD_OK: + case SCLD_EXISTS: + break; + default: + die(_("could not create leading directories " + "of '%s'"), output_directory); + } + set_shared_repository(saved); if (mkdir(output_directory, 0777) < 0 && errno != EEXIST) die_errno(_("could not create directory '%s'"), output_directory); diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 72b09896cf..9facc3a79e 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1606,6 +1606,29 @@ test_expect_success 'From line has expected format' ' test_cmp from filtered ' +test_expect_success 'format-patch -o with no leading directories' ' + rm -fr patches && + git format-patch -o patches master..side && + count=$(git rev-list --count master..side) && + ls patches >list && + test_line_count = $count list +' + +test_expect_success 'format-patch -o with leading existing directories' ' + git format-patch -o patches/side master..side && + count=$(git rev-list --count master..side) && + ls patches/side >list && + test_line_count = $count list +' + +test_expect_success 'format-patch -o with leading non-existing directories' ' + rm -fr patches && + git format-patch -o patches/side master..side && + count=$(git rev-list --count master..side) && + ls patches/side >list && + test_line_count = $count list +' + test_expect_success 'format-patch format.outputDirectory option' ' test_config format.outputDirectory patches && rm -fr patches && From patchwork Fri Oct 11 08:36:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bert Wesarg X-Patchwork-Id: 11185025 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A785F112B for ; Fri, 11 Oct 2019 08:36:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EEC520679 for ; Fri, 11 Oct 2019 08:36:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="cS8UdQL8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726706AbfJKIgr (ORCPT ); Fri, 11 Oct 2019 04:36:47 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50454 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726397AbfJKIgr (ORCPT ); Fri, 11 Oct 2019 04:36:47 -0400 Received: by mail-wm1-f67.google.com with SMTP id 5so9521102wmg.0 for ; Fri, 11 Oct 2019 01:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/cXMO3PinVYgqSLEFFm2db7pEvb/AG+LxHFEx2G8Ffg=; b=cS8UdQL872yIneVQc2pKwnu3Q8tLi8Gn8BMSvMNDzC7ApUpKwH7w5ZvHpLLwgBQDpA 7pmg4ZItRcpq8MSuEcevldJoszVostw11b1ryax8svyfDuOAF1QY3HzcE9j+6sY2kc4b U1kDaG3tUp1nVie63+i6Ffty08GHtJCd/jh95JWzeGKa7Kx50Bix3vPX0q5w9jzBzdDC DvF4eG7lTR9BIY7hCrh3ZQsvw1JC2+ekTDEgymBLWRfa6OhsOIYTG5N2CsaLgvS6hKsH S1wQsWaPmMwrrtOZeNgKsznFF9+joWBo6ixL5ER2C8gZwlRy6gBVVKo+YqK8LTlOZZyo DBGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/cXMO3PinVYgqSLEFFm2db7pEvb/AG+LxHFEx2G8Ffg=; b=UVBDZCMOt2UurOCeJ3tDa+9IUWdd2XxNLujSB7tFpMVGJXY0V6OW4X4AbEuzzWZHzL eg5g6QbWfa+OhzOIi2OP9AeeztA5X797bHsJFdB1G9di26xCGUH9o4869YtO6+93Eld0 XKJsHlLh/BnALqDvlDgo4awE1QJmnIR9edfa7gZU4URhQdtGItLMJDKyf/7ocN6Lhj40 IAJeSUH48OvP1iID/uvh+8D9kBqtpKwwXGtSfxXVWXQsQrBG+moQ8Pt9zA9SKznTVhbO d38QWN4485XWZacVKpHudp38dJkLqm/YCa7dHqilV+dfLPUKoQEF6ano00FrYPka5QkR wIVw== X-Gm-Message-State: APjAAAXMgmJdHXmkauuujBFnhbcJW3s40g/2jUA3689rK3uT4kVinW6l h5QT8G54boSdEU5uGoM= X-Google-Smtp-Source: APXvYqxD3dHbl8Q873I7KbpoNmw9af+f6UfMAmbxqY7g+dUnw/ZwVFkg0iw6rVwXWxoK2gZRdBj3hw== X-Received: by 2002:a05:600c:2201:: with SMTP id z1mr2298110wml.169.1570783004653; Fri, 11 Oct 2019 01:36:44 -0700 (PDT) Received: from localhost (m221.zih.tu-dresden.de. [141.30.68.221]) by smtp.gmail.com with ESMTPSA id q10sm15990337wrd.39.2019.10.11.01.36.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Oct 2019 01:36:44 -0700 (PDT) From: Bert Wesarg To: git@vger.kernel.org Cc: Bert Wesarg , Alexander Kuleshov , Eric Sunshine , Denton Liu , Junio C Hamano Subject: [PATCH v4 2/2] format-patch: configure a command to generate the output directory name Date: Fri, 11 Oct 2019 10:36:42 +0200 Message-Id: X-Mailer: git-send-email 2.23.0.13.g28bc381d7c In-Reply-To: References: <30278644805925935d05ae877c4b14843e37e40c.1570469582.git.bert.wesarg@googlemail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The 'format.outputDirectory' configuration is only able to store constant directory names. Though some may use $ git format-patch -o $(createdir) … to name the directory dynamically. Provide a new configuration to be able to store such a command too. Signed-off-by: Bert Wesarg --- Changes in v2: * rephrase motivation Changes in v3: * remove RFC Changes in v4: * based on dl/format-patch-doc-test-cleanup and adopt it Cc: Alexander Kuleshov Cc: Eric Sunshine Cc: Denton Liu Cc: Junio C Hamano --- Documentation/config/format.txt | 5 +++++ Documentation/git-format-patch.txt | 6 +++++- builtin/log.c | 24 +++++++++++++++++++++++- t/t4014-format-patch.sh | 26 ++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt index 40cad9278f..420188a1c6 100644 --- a/Documentation/config/format.txt +++ b/Documentation/config/format.txt @@ -83,6 +83,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. diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 2035d4d5d5..4936b9f91d 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -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 diff --git a/builtin/log.c b/builtin/log.c index 8d08632858..3eb507c02f 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -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); diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 9facc3a79e..14c8f5e854 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1646,6 +1646,32 @@ 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 && + count=$(git rev-list --count master..side) && + ls patches >list && + test_line_count = $count list +' + +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 &&