Prowlarr/Indexers
1
0
Fork 0
mirror of https://github.com/Prowlarr/Indexers.git synced 2025-12-20 02:58:28 +00:00
Code Activity

Fixed: use rebase strategy for clean history in sync script

Browse Source
This commit is contained in:
ServarrAdmin
2025-08-19 07:43:49 -05:00
parent 25bbe55392
commit 6cfe6f2dea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/indexer-sync-v2.sh
View File

@@ -1016,7 +1016,7 @@ push_changes() {
log "SUCCESS" "[$prowlarr_push_remote $push_branch] Branch Pushed" log "SUCCESS" "[$prowlarr_push_remote $push_branch] Branch Pushed"
else else
log "WARN" "Push failed, attempting to pull and retry..." log "WARN" "Push failed, attempting to pull and retry..."
if git pull "$prowlarr_push_remote" "$push_branch" --no-edit --no-rebase; then if git pull "$prowlarr_push_remote" "$push_branch" --rebase; then
log "INFO" "Successfully pulled changes, retrying push..." log "INFO" "Successfully pulled changes, retrying push..."
if git push "$prowlarr_push_remote" "$push_branch" --force-if-includes; then if git push "$prowlarr_push_remote" "$push_branch" --force-if-includes; then
log "SUCCESS" "[$prowlarr_push_remote $push_branch] Branch Pushed after pull" log "SUCCESS" "[$prowlarr_push_remote $push_branch] Branch Pushed after pull"