From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/3] t7610-mergetool: do not place pipelines headed by `yes` in subshells
Date: Mon, 10 Jun 2019 11:59:42 +0200 [thread overview]
Message-ID: <20190610095942.GA19035@szeder.dev> (raw)
In-Reply-To: <75c812bd4838f6f35b6f42b97ae396ebb28d8b95.1560152205.git.j6t@kdbg.org>
On Mon, Jun 10, 2019 at 10:58:58AM +0200, Johannes Sixt wrote:
> Subshells for pipelines are not required. This can save a number of
> processes (if the shell does not optimize it away anyway).
>
> The patch was generated with the command
>
> sed -i 's/( *\(yes.*[^ ]\) *) *\&\&/\1 \&\&/' t7610-mergetool.sh
>
> with a manual fixup of the case having no && at the end.
I think it would be great to include the corresponding numbers from
the cover letter in each of the commit messages.
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
> t/t7610-mergetool.sh | 170 +++++++++++++++++++++----------------------
> 1 file changed, 85 insertions(+), 85 deletions(-)
>
> diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
> index 5b61c10a9c..b67440882b 100755
> --- a/t/t7610-mergetool.sh
> +++ b/t/t7610-mergetool.sh
> @@ -131,13 +131,13 @@ test_expect_success 'custom mergetool' '
> git checkout -b test$test_count branch1 &&
> git submodule update -N &&
> test_must_fail git merge master &&
> - ( yes "" | git mergetool both ) &&
> - ( yes "" | git mergetool file1 file1 ) &&
> - ( yes "" | git mergetool file2 "spaced name" ) &&
> - ( yes "" | git mergetool subdir/file3 ) &&
> - ( yes "d" | git mergetool file11 ) &&
> - ( yes "d" | git mergetool file12 ) &&
> - ( yes "l" | git mergetool submod ) &&
> + yes "" | git mergetool both &&
> + yes "" | git mergetool file1 file1 &&
> + yes "" | git mergetool file2 "spaced name" &&
> + yes "" | git mergetool subdir/file3 &&
> + yes "d" | git mergetool file11 &&
> + yes "d" | git mergetool file12 &&
> + yes "l" | git mergetool submod &&
> test "$(cat file1)" = "master updated" &&
> test "$(cat file2)" = "master new" &&
> test "$(cat subdir/file3)" = "master new sub" &&
Another possibility for eliminating a few more subshells might be to
turn these
test "$(cat file1)" = "that"'
checks into
echo that >expect &&
test_cmp expect file1
because 'test_cmp' on Windows first compares the two files in shell
and runs 'diff' only when there is a difference to report.
next prev parent reply other threads:[~2019-06-10 9:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 8:58 [PATCH 0/3] Reduce number of processes spawned by git-mergetool Johannes Sixt
2019-06-10 8:58 ` [PATCH 1/3] t7610-mergetool: do not place pipelines headed by `yes` in subshells Johannes Sixt
2019-06-10 9:59 ` SZEDER Gábor [this message]
2019-06-10 17:23 ` Junio C Hamano
2019-06-10 17:56 ` SZEDER Gábor
2019-06-10 18:29 ` Johannes Schindelin
2019-06-10 18:57 ` SZEDER Gábor
2019-06-10 8:58 ` [PATCH 2/3] mergetool: dissect strings with shell variable magic instead of `expr` Johannes Sixt
2019-06-10 17:17 ` Junio C Hamano
2019-06-10 21:34 ` Johannes Sixt
2019-06-10 8:59 ` [PATCH 3/3] mergetool: use shell variable magic instead of `awk` Johannes Sixt
2019-06-10 17:21 ` Junio C Hamano
2019-06-10 22:01 ` Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 0/4] Reduce number of processes spawned by git-mergetool Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 1/4] t7610-mergetool: do not place pipelines headed by `yes` in subshells Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 2/4] t7610-mergetool: use test_cmp instead of test $(cat file) = $txt Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 3/4] mergetool: dissect strings with shell variable magic instead of `expr` Johannes Sixt
2019-06-12 16:33 ` [PATCH v2 4/4] mergetool: use shell variable magic instead of `awk` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190610095942.GA19035@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).