summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2018-01-30 21:21:18 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-30 14:04:00 -0800
commit5684c2bc69d6b06cca708a859843c9b2468068d8 (patch)
tree5af335a5bdbcae8df09e267c1f4779d17c95d016 /merge-recursive.h
parentwildmatch test: don't try to vertically align our output (diff)
downloadtgif-5684c2bc69d6b06cca708a859843c9b2468068d8.tar.xz
wildmatch test: use a paranoia pattern from nul_match()
Use a pattern from the nul_match() function in t7008-grep-binary.sh to make sure that we don't just fall through to the "else" if there's an unknown parameter. This is something I added in commit 77f6f4406f ("grep: add a test helper function for less verbose -f \0 tests", 2017-05-20) to grep tests, which were modeled on these wildmatch tests, and I'm now porting back to the original wildmatch tests. I am not using the "say '...'; exit 1" pattern from t0000-basic.sh because if I fail I want to run the rest of the tests (unless under -i), and doing this makes sure we do that and don't exit right away without fully reporting our errors. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions