]> git.ipfire.org Git - thirdparty/git.git/commit - git-mergetool.sh
mergetool: dissect strings with shell variable magic instead of `expr`
authorJohannes Sixt <j6t@kdbg.org>
Wed, 12 Jun 2019 16:33:47 +0000 (18:33 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Jun 2019 20:20:56 +0000 (13:20 -0700)
commit8b014655105e27d44cf62f61dd6b24322a57048f
tree3c0ebfd1c99268f879ce0b37bc049a742c88bffd
parente10dffd067002ea83c5293c9440adc5f23825110
mergetool: dissect strings with shell variable magic instead of `expr`

git-mergetool spawns an enormous amount of processes. For this reason,
the test script, t7610, is exceptionally slow, in particular, on
Windows. Most of the processes are invocations of git. There are
also some that can be replaced with shell builtins. Do so with `expr`.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool.sh