mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2026-05-07 23:51:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: always force push

Browse Source
This commit is contained in:
ljm42
2024-08-13 10:27:48 -07:00
parent 5827b5ffa3
commit e6bd7a54be
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/UpdateFlashBackup.php
+2 -5
View File
@@ -696,11 +696,8 @@ if ($command == 'update' || $command == 'activate') {
exec_log('git -C /boot add -A'); exec_log('git -C /boot add -A');
exec_log('git -C /boot commit -m ' . escapeshellarg($commitmsg)); exec_log('git -C /boot commit -m ' . escapeshellarg($commitmsg));
// push changes upstream // push changes upstream
exec_log('git -C /boot push --set-upstream origin master', $push_output, $return_var); exec_log('git -C /boot push --force --set-upstream origin master', $push_output, $return_var);
if ($return_var != 0) {
exec_log('git -C /boot push --force --set-upstream origin master', $push_output, $return_var);
}
if ($return_var != 0) { if ($return_var != 0) {
// check for permission denied // check for permission denied
if (stripos(implode($push_output),'permission denied') !== false) { if (stripos(implode($push_output),'permission denied') !== false) {