1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-30 02:32:41 +01:00

(stable) Promote 2018 Week 23

This commit is contained in:
epriestley 2018-06-08 16:41:38 -07:00
commit 8b1be5b87f
2 changed files with 6 additions and 3 deletions

View file

@ -133,6 +133,7 @@ final class ArcanistConfigurationDrivenUnitTestEngine
$engine $engine
->setWorkingCopy($this->getWorkingCopy()) ->setWorkingCopy($this->getWorkingCopy())
->setEnableCoverage($this->getEnableCoverage()) ->setEnableCoverage($this->getEnableCoverage())
->setConfigurationManager($this->getConfigurationManager())
->setRenderer($renderer); ->setRenderer($renderer);
// TODO: At some point, maybe we should emit a warning here if an engine // TODO: At some point, maybe we should emit a warning here if an engine

View file

@ -714,9 +714,6 @@ EOTEXT
throw new ArcanistUsageException(pht('Unable to apply patch!')); throw new ArcanistUsageException(pht('Unable to apply patch!'));
} }
// in case there were any submodule changes involved
$repository_api->execPassthru('submodule update --init --recursive');
if ($this->shouldCommit()) { if ($this->shouldCommit()) {
if ($bundle->getFullAuthor()) { if ($bundle->getFullAuthor()) {
$author_cmd = csprintf('--author=%s', $bundle->getFullAuthor()); $author_cmd = csprintf('--author=%s', $bundle->getFullAuthor());
@ -754,6 +751,11 @@ EOTEXT
} }
} }
// Synchronize submodule state, since the patch may have made changes
// to ".gitmodules". We do this after we finish managing branches so
// the behavior is correct under "--nobranch"; see PHI648.
$repository_api->execPassthru('submodule update --init --recursive');
echo phutil_console_format( echo phutil_console_format(
"<bg:green>** %s **</bg> %s\n", "<bg:green>** %s **</bg> %s\n",
pht('OKAY'), pht('OKAY'),