Fix more git URL escaping
parent
8501bb71e2
commit
9cb6c2322a
|
@ -366,7 +366,7 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface
|
|||
$this->io->writeError(' <warning>'.$reference.' is gone (history was rewritten?)</warning>');
|
||||
}
|
||||
|
||||
throw new \RuntimeException('Failed to execute ' . GitUtil::sanitizeUrl($command) . "\n\n" . $this->process->getErrorOutput());
|
||||
throw new \RuntimeException(GitUtil::sanitizeUrl('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()));
|
||||
}
|
||||
|
||||
protected function updateOriginUrl($path, $url)
|
||||
|
|
|
@ -83,7 +83,7 @@ class Git
|
|||
}
|
||||
|
||||
// failed to checkout, first check git accessibility
|
||||
$this->throwException('Failed to clone ' . self::sanitizeUrl($url) .' via '.implode(', ', $protocols).' protocols, aborting.' . "\n\n" . implode("\n", $messages), $url);
|
||||
$this->throwException('Failed to clone ' . $url .' via '.implode(', ', $protocols).' protocols, aborting.' . "\n\n" . implode("\n", $messages), $url);
|
||||
}
|
||||
|
||||
// if we have a private github url and the ssh protocol is disabled then we skip it and directly fallback to https
|
||||
|
@ -192,7 +192,7 @@ class Git
|
|||
if ($initialClone) {
|
||||
$this->filesystem->removeDirectory($origCwd);
|
||||
}
|
||||
$this->throwException('Failed to execute ' . self::sanitizeUrl($command) . "\n\n" . $this->process->getErrorOutput(), $url);
|
||||
$this->throwException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput(), $url);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -266,9 +266,9 @@ class Git
|
|||
clearstatcache();
|
||||
|
||||
if (0 !== $this->process->execute('git --version', $ignoredOutput)) {
|
||||
throw new \RuntimeException('Failed to clone '.self::sanitizeUrl($url).', git was not found, check that it is installed and in your PATH env.' . "\n\n" . $this->process->getErrorOutput());
|
||||
throw new \RuntimeException(self::sanitizeUrl('Failed to clone '.$url.', git was not found, check that it is installed and in your PATH env.' . "\n\n" . $this->process->getErrorOutput()));
|
||||
}
|
||||
|
||||
throw new \RuntimeException($message);
|
||||
throw new \RuntimeException(self::sanitizeUrl($message));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue