upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-02-03 20:40:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/git-backup: fix force push (#4988)

Browse source
This commit is contained in:
Hleb Shauchenka 2025-10-22 15:35:52 +02:00 committed by GitHub
parent a828890850
commit 416712dbed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/git-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Git.php
View file

@ -168,7 +168,7 @@ class Git extends Base implements IBackupProvider
}
exec("cd {$targetdir} && {$git} remote remove origin");
exec("cd {$targetdir} && {$git} remote add origin " . escapeshellarg($url));
$force_flag = (string)$mdl->force_push === "1" ? "--force-with-lease " : "";
$force_flag = (string)$mdl->force_push === "1" ? "--force " : "";
$pushtxt = shell_exec(
"(cd {$targetdir} && {$git} push {$force_flag}origin " . escapeshellarg("master:{$mdl->branch}") .
" && echo '__exit_ok__') 2>&1"