comparison tests/test-merge-criss-cross.t @ 29257:a9764ab80e11 stable 3.8.3

tests-subrepo-git: emit a different "pwned" message based on the test Having a single "pwned" message which may or may not be emitted during the tests for CVE-2016-3068 leads to extra confusion. Allow each test to emit a more detailed message based on what the expectations are. In both cases, we expect a version of git which has had the vulnerability plugged, as well as a version of mercurial which also knows about GIT_ALLOW_PROTOCOL. For the first test, we make sure GIT_ALLOW_PROTOCOL is unset, meaning that the ext-protocol subrepo should be ignored; if it isn't, there's either a problem with mercurial or the installed copy of git. For the second test, we explicitly allow ext-protocol subrepos, which means that the subrepo will be accessed and a message emitted confirming that this was, in fact, our intention.
author Danek Duvall <danek.duvall@oracle.com>
date Fri, 27 May 2016 15:20:03 -0700
parents 6b1fc09c699a
children 72c36a2be2d6
comparison
equal deleted inserted replaced
29256:1f8b861ba15c 29257:a9764ab80e11