rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(git): handle additional repository URL cases for 'tangled' and improve branch assignment logic

Browse source
This commit is contained in:
Andras Bacsai 2025-09-30 12:22:57 +02:00
parent a9e1d4cb79
commit 8e7c869d23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Livewire/Project/New/PublicGitRepository.php
View file

@ -176,13 +176,16 @@ public function loadBranch()
str($this->repository_url)->startsWith('http://')) && str($this->repository_url)->startsWith('http://')) &&
! str($this->repository_url)->endsWith('.git') && ! str($this->repository_url)->endsWith('.git') &&
(! str($this->repository_url)->contains('github.com') || (! str($this->repository_url)->contains('github.com') ||
! str($this->repository_url)->contains('git.sr.ht')) ! str($this->repository_url)->contains('git.sr.ht')) &&
! str($this->repository_url)->contains('tangled')
) { ) {
$this->repository_url = $this->repository_url.'.git'; $this->repository_url = $this->repository_url.'.git';
} }
if (str($this->repository_url)->contains('github.com') && str($this->repository_url)->endsWith('.git')) { if (str($this->repository_url)->contains('github.com') && str($this->repository_url)->endsWith('.git')) {
$this->repository_url = str($this->repository_url)->beforeLast('.git')->value(); $this->repository_url = str($this->repository_url)->beforeLast('.git')->value();
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }
@ -190,6 +193,9 @@ public function loadBranch()
$this->branchFound = false; $this->branchFound = false;
$this->getGitSource(); $this->getGitSource();
$this->getBranch(); $this->getBranch();
if (str($this->repository_url)->contains('tangled')) {
$this->git_branch = 'master';
}
$this->selectedBranch = $this->git_branch; $this->selectedBranch = $this->git_branch;
} catch (\Throwable $e) { } catch (\Throwable $e) {
if ($this->rate_limit_remaining == 0) { if ($this->rate_limit_remaining == 0) {