Prowlarr/Indexers
1
0
Fork 0
mirror of https://github.com/Prowlarr/Indexers.git synced 2025-12-24 13:08:27 +00:00
Code Activity

Fixed: sync script auto-resets to master on rebase conflicts only in automation mode

Browse Source
This commit is contained in:
ServarrAdmin
2025-09-17 16:26:23 -05:00
parent 20a201bea5
commit f0be3ea6a7
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,26 +437,42 @@ git_branch_reset() {
log "DEBUG" "Development Mode - Skipping reset to [$prowlarr_remote_name/$prowlarr_target_branch]" log "DEBUG" "Development Mode - Skipping reset to [$prowlarr_remote_name/$prowlarr_target_branch]"
else else
git reset --hard "$prowlarr_remote_name"/"$prowlarr_target_branch" git reset --hard "$prowlarr_remote_name"/"$prowlarr_target_branch"
# Rebase on master to ensure we're up to date with merged changes # Try to rebase on master
if ! git rebase "$prowlarr_remote_name"/"$PROWLARR_RELEASE_BRANCH"; then if ! git rebase "$prowlarr_remote_name"/"$PROWLARR_RELEASE_BRANCH"; then
if [ "$automation_mode" = true ]; then
log "WARN" "Rebase failed in automation mode, starting fresh from master instead"
git rebase --abort
git reset --hard "$prowlarr_remote_name"/"$PROWLARR_RELEASE_BRANCH"
log "INFO" "local [$prowlarr_target_branch] reset to master [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]"
else
log "ERROR" "Rebase failed due to conflicts with [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]" log "ERROR" "Rebase failed due to conflicts with [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]"
git rebase --abort git rebase --abort
exit 9 exit 9
fi fi
else
log "INFO" "local [$prowlarr_target_branch] reset and rebased on [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]" log "INFO" "local [$prowlarr_target_branch] reset and rebased on [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]"
fi fi
fi
else else
git checkout -B "$prowlarr_target_branch" "$prowlarr_remote_name"/"$prowlarr_target_branch" git checkout -B "$prowlarr_target_branch" "$prowlarr_remote_name"/"$prowlarr_target_branch"
log "INFO" "local [$prowlarr_target_branch] created from [$prowlarr_remote_name/$prowlarr_target_branch]" log "INFO" "local [$prowlarr_target_branch] created from [$prowlarr_remote_name/$prowlarr_target_branch]"
# Rebase on master to ensure we're up to date with merged changes # Try to rebase on master
if ! git rebase "$prowlarr_remote_name"/"$PROWLARR_RELEASE_BRANCH"; then if ! git rebase "$prowlarr_remote_name"/"$PROWLARR_RELEASE_BRANCH"; then
if [ "$automation_mode" = true ]; then
log "WARN" "Rebase failed in automation mode, starting fresh from master instead"
git rebase --abort
git checkout -B "$prowlarr_target_branch" "$prowlarr_remote_name"/"$PROWLARR_RELEASE_BRANCH" --no-track
log "INFO" "local [$prowlarr_target_branch] created fresh from master [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]"
else
log "ERROR" "Rebase failed due to conflicts with [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]" log "ERROR" "Rebase failed due to conflicts with [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]"
git rebase --abort git rebase --abort
exit 9 exit 9
fi fi
else
log "INFO" "rebased [$prowlarr_target_branch] on [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]" log "INFO" "rebased [$prowlarr_target_branch] on [$prowlarr_remote_name/$PROWLARR_RELEASE_BRANCH]"
fi fi
fi fi
fi
} }
pull_cherry_and_merge() { pull_cherry_and_merge() {