summaryrefslogtreecommitdiff
path: root/mergetools/ecmerge
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder.dev@gmail.com>2019-01-05 02:08:55 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-07 09:24:05 -0800
commit8cf5800681a6f7c3324f835673974e39e598d1b5 (patch)
tree44a83215e43e80bfa1f7fb43f80bb60bf856279a /mergetools/ecmerge
parenttest-lib: parse options in a for loop to keep $@ intact (diff)
downloadtgif-8cf5800681a6f7c3324f835673974e39e598d1b5.tar.xz
test-lib: parse command line options earlier
'test-lib.sh' looks for the presence of certain options like '--tee' and '--verbose-log', so it can execute the test script again to save its standard output and error. It looks for '--valgrind' as well, to set up some Valgrind-specific stuff. These all happen before the actual option parsing loop, and the conditions looking for these options look a bit odd, too. They are not completely correct, either, because in a bogus invocation like './t1234-foo.sh -r --tee' they recognize '--tee', although it should be handled as the required argument of the '-r' option. This patch series will add two more options to look out for early, and, in addition, will have to extract these options' stuck arguments (i.e. '--opt=arg') as well. So let's move the option parsing loop and the couple of related conditions following it earlier in 'test-lib.sh', before the place where the test script is executed again for '--tee' and its friends. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions