Remove credentials from merge source URL before using it to place cache file in correct sub-folder

aik099 · aik099 · commit 1ba57202e455 · 2024-10-30T14:46:25.000+02:00
diff --git a/src/SVNBuddy/Command/MergeCommand.php b/src/SVNBuddy/Command/MergeCommand.php
@@ -563,6 +563,8 @@ protected function getUsableRevisions($source_url, $wc_path)
 	 */
 	protected function calculateUsableRevisions($source_url, $wc_path)
 	{
+		$source_url = $this->repositoryConnector->removeCredentials($source_url);
+
 		$command = $this->repositoryConnector->getCommand(
 			'mergeinfo',
 			array(

Original file line number	Diff line number	Diff line change
`@@ -563,6 +563,8 @@ protected function getUsableRevisions($source_url, $wc_path)`
`563`	`563`	`*/`
`564`	`564`	`protected function calculateUsableRevisions($source_url, $wc_path)`
`565`	`565`	`{`
	`566`	`+ $source_url = $this->repositoryConnector->removeCredentials($source_url);`
	`567`	`+`
`566`	`568`	`$command = $this->repositoryConnector->getCommand(`
`567`	`569`	`'mergeinfo',`
`568`	`570`	`array(`