From patchwork Mon Oct 21 10:25:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bert Wesarg X-Patchwork-Id: 11201817 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 7BD5F1390 for ; Mon, 21 Oct 2019 10:25:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FE0E2084C for ; Mon, 21 Oct 2019 10:25:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="nhtaF5re" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727889AbfJUKZ2 (ORCPT ); Mon, 21 Oct 2019 06:25:28 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:40341 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726767AbfJUKZ1 (ORCPT ); Mon, 21 Oct 2019 06:25:27 -0400 Received: by mail-wm1-f68.google.com with SMTP id b24so12174497wmj.5 for ; Mon, 21 Oct 2019 03:25:25 -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=HMvEyMtQ6rknd/W2z3oI/7vtWKqTCXS9NqLV0AaFNZU=; b=nhtaF5rez2jQbI36lhJlSQoFds8ojAovJLaJE9uBYJZ1OotZ5OfnU9GTxlSsF/ftUA 0nP+jInhGtrBCxTQbhhA0Y15Nu2JO83L9rpAnAJ3P2Y1xkmQWjSXF6WKhNY8N/OZk/iS ycCXMW599h6kNiuDPIRxSM+CSiPVvIgnPfw2rUHpb2r2FwCP8av/4Kc0v482bEBnQhY8 C042p4J7AGuJoMSCmDI+7uyxqdRO/y0rKs2yE+f2WCLus/sIxTEXbhQuNJq4Fgu21M/5 /Go0I6pd0J3yedBIsxyADVM9fWTZ0fkjexajBUESKijF7rkvKNl5JHuTuHlJPJ8V9SFj e/xg== 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=HMvEyMtQ6rknd/W2z3oI/7vtWKqTCXS9NqLV0AaFNZU=; b=PX4sF/pL3UXCOv4Zt6/JZno0+OvqCTIbnZeFSGBRX+VOdqnNLnjk8qK5CGHTfbBTDr 0MtOFgGuONmjEIE0zx2CAfIfiWqWtrlgVEz3q1NE/+CWaRL5TMAkjJZtZJou0Lq5jqAU HatZ5iYTsTd4mG0ITZhRvb5CXpcpyS8vGFsqK9j1iZ7NlgWjisBDnq/jqqTnCw+HPqXi aRIvQsE8XvcwL5Wy5o1DRAm9fTmUVcVlaCJReJGJRhnX5es4kl/mhLIQVp4JPh4oh1Dw kjFURr6xqmpaqwzqT/kmaoo3lJdIY6R6mmTyXA5U6LxHdXdo+7fppT+9bNUcWC2mQSJk DGiQ== X-Gm-Message-State: APjAAAU0v3YXiU6KJFqys3nV5eMxkUhceNOQep6EQ9OHqmwvyYwMc9EY 0qO9OkAQXsOE6X4qn1w= X-Google-Smtp-Source: APXvYqybAEufrbzOvVUQdZahnLR9N7Gx7g+AKjLaFtJ0C6JwE17OCryKALM++lw0kyejvt8aZIuu7w== X-Received: by 2002:a1c:6a07:: with SMTP id f7mr5954045wmc.124.1571653524789; Mon, 21 Oct 2019 03:25:24 -0700 (PDT) Received: from localhost (m221.zih.tu-dresden.de. [141.30.68.221]) by smtp.gmail.com with ESMTPSA id y186sm18084848wmb.41.2019.10.21.03.25.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Oct 2019 03:25:24 -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 v5 1/2] format-patch: create leading components of output directory Date: Mon, 21 Oct 2019 12:25:22 +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 Changes in v5: * make tests self-contained 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 | 26 ++++++++++++++++++++++++++ 4 files changed, 45 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..3aab25da76 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1606,6 +1606,32 @@ 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' ' + rm -rf existing-dir && + mkdir existing-dir && + git format-patch -o existing-dir/patches master..side && + count=$(git rev-list --count master..side) && + ls existing-dir/patches >list && + test_line_count = $count list +' + +test_expect_success 'format-patch -o with leading non-existing directories' ' + rm -rf non-existing-dir && + git format-patch -o non-existing-dir/patches master..side && + count=$(git rev-list --count master..side) && + test_path_is_dir non-existing-dir + ls non-existing-dir/patches >list && + test_line_count = $count list +' + test_expect_success 'format-patch format.outputDirectory option' ' test_config format.outputDirectory patches && rm -fr patches && From patchwork Mon Oct 21 10:25:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bert Wesarg X-Patchwork-Id: 11201819 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 A81A714ED for ; Mon, 21 Oct 2019 10:25:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 85D4A2084C for ; Mon, 21 Oct 2019 10:25:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=googlemail.com header.i=@googlemail.com header.b="lIIoK1R1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728081AbfJUKZ2 (ORCPT ); Mon, 21 Oct 2019 06:25:28 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:42197 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727685AbfJUKZ2 (ORCPT ); Mon, 21 Oct 2019 06:25:28 -0400 Received: by mail-wr1-f65.google.com with SMTP id r1so3479240wrs.9 for ; Mon, 21 Oct 2019 03:25:26 -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=D66z22uoC2R3PwCU7Y03BDnnvu575xhAmwWnwbFIBYE=; b=lIIoK1R1thwaVWcthOugdVXGQV6W0yEhmWoPQ+fnXBH14lplF/MKVFunhegR7rQ6dD bMFaw+CaQPSP+Ty68yOZL8uRRNo5TWfAQwD+4VEFdjcuni7Exv7W6MCioqBBYwtNJTfU 0rlhJSih6jL0QCYb63t5kNpnhqkLEppmfKkEfHrGae1mjuLHmnjL3JYHrL/djgfWVLzk 2siOLfmx4R1MRmH2fddCC+t6tbuY1V3HmyE89Po3hF9n+4nIEujqyNIUho48w33rD9bP 072wiozFD//1h2FHBTiV/0ytrFrpEHaM/LKSLnyJuq//+DleQdsSAGYMPS29ds4pRcvW MnDw== 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=D66z22uoC2R3PwCU7Y03BDnnvu575xhAmwWnwbFIBYE=; b=bLbqAceX6HnNkWUNcHi3bNxXtMup1Ha9s46RdsRY8wtqQlY4Erfp6xLyUAp/wRNOby nZK1KuKgk+EUuDcLL0Z2TFkIjcOpke7/ljB7tOXVOf3E3e2Zt6Ws7AxdV74ivxi2vGyD MilULd6HdGau1o7/8paS+1L25JG7Q/F5kXhEnd66NTXyXYPmmjADzoGUvNnTmekNUBoL l2/EAixinVRL+eenICI89Nf2vwaIrOb8Y7coAwXOWAnJe9ZUA4D4GDMnY1gTh+sV+tlc xW+EcjGtvoZuCxWx0NznwRvy7ZqpUS6qKQUgSH/KrwH2gPVIr7iXRQ8hv3wEfShZAIaR JZTw== X-Gm-Message-State: APjAAAXihm09iJ2uVVnZE0XOPT/hEaTKNuEDJxG3YdgTJliQzKdq2gtX QQip3I2jYbEgJZOA7gXhOg== X-Google-Smtp-Source: APXvYqx2W43QCSnM9jXEOLZkcaqr+UzOb03m7f82ocEJXRROau8huWMqzTH7B49PIFLIco2S3zD9ww== X-Received: by 2002:adf:e78c:: with SMTP id n12mr18371506wrm.351.1571653526023; Mon, 21 Oct 2019 03:25:26 -0700 (PDT) Received: from localhost (m221.zih.tu-dresden.de. [141.30.68.221]) by smtp.gmail.com with ESMTPSA id v10sm7298691wrm.26.2019.10.21.03.25.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Oct 2019 03:25:25 -0700 (PDT) From: Bert Wesarg To: git@vger.kernel.org Cc: Bert Wesarg , Alexander Kuleshov , Eric Sunshine , Denton Liu , Junio C Hamano Subject: [PATCH v5 2/2] format-patch: configure a command to generate the output directory name Date: Mon, 21 Oct 2019 12:25:23 +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 Changes in v5: * none 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 3aab25da76..725706ded5 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1649,6 +1649,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 &&