From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Johannes Sixt <j6t@kdbg.org>, 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 20:57:08 +0200 [thread overview]
Message-ID: <20190610185708.GC4012@szeder.dev> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1906102026030.789@QRFXGBC-DHN364S.ybpnyqbznva>
On Mon, Jun 10, 2019 at 08:29:56PM +0200, Johannes Schindelin wrote:
> Hi,
>
> On Mon, 10 Jun 2019, SZEDER Gábor wrote:
>
> > > 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.
>
> When you remember that spawning processes is much more expensive on
> Windows, still, than I/O, you will realize that this adds even more
> expense. Instead of a spawn & read, you are suggesting essentially a
> write, spawn, read & read, and that is only the best case.
No, instead of a spawn (the subshell of the command substitution), spawn
('cat'), read, I suggest a write, read, read (no subshell or external
process in 'mingw_test_cmp's main code path).
> In the worst case, it would be a write, spawn, read & read, spawn, read &
> read.
It would be a write, read, read, only one spawn (diff), read read, but
I assume that the tests succeed, so I ignore this worst case.
> (Even if the first spawn is an MSYS2 spawn on Windows, which is more
> expensive than the MINGW spawn for the `git diff`, if that is a `git diff`
> rather than `diff`, didn't check...)
>
> So I am rather negative about this suggestion ;-)
>
> Ciao,
> Dscho
next prev parent reply other threads:[~2019-06-10 18:57 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
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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190610185708.GC4012@szeder.dev \
--to=szeder.dev@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.