diff --git a/scripts/backup-main.sh b/scripts/backup-main.sh index 8091b8c6..b243dc3a 100755 --- a/scripts/backup-main.sh +++ b/scripts/backup-main.sh @@ -1,6 +1,6 @@ #!/bin/bash # Backup main branch with smart duplicate detection -# Also pushes any unpushed main commits before backing up +# Does NOT push main — use /repo_sync-repos for that set -e # Exit on any error @@ -20,7 +20,6 @@ declare -a SUMMARY_STATUS declare -a SUMMARY_COMMITS declare -a SUMMARY_LAST_MSG declare -a SUMMARY_BRANCH -declare -a SUMMARY_PUSHED SUMMARY_IDX=0 echo -e "${BOLD}🔄 Starting main branch backup...${NC}" @@ -43,7 +42,6 @@ backup_repo() { SUMMARY_COMMITS[$SUMMARY_IDX]="-" SUMMARY_LAST_MSG[$SUMMARY_IDX]="-" SUMMARY_BRANCH[$SUMMARY_IDX]="-" - SUMMARY_PUSHED[$SUMMARY_IDX]="-" SUMMARY_IDX=$((SUMMARY_IDX + 1)) return 1 fi @@ -63,7 +61,6 @@ backup_repo() { SUMMARY_COMMITS[$SUMMARY_IDX]="-" SUMMARY_LAST_MSG[$SUMMARY_IDX]="-" SUMMARY_BRANCH[$SUMMARY_IDX]="-" - SUMMARY_PUSHED[$SUMMARY_IDX]="-" SUMMARY_IDX=$((SUMMARY_IDX + 1)) return 1 fi @@ -71,23 +68,6 @@ backup_repo() { # Gather repo stats local last_msg=$(git log -1 --pretty=format:'%s' 2>/dev/null | head -c 50) - # Push any unpushed main commits first - local ahead_count=0 - ahead_count=$(git rev-list --count origin/main..HEAD 2>/dev/null || echo "0") - local pushed_main="—" - if [ "$ahead_count" -gt 0 ]; then - echo -e " ${CYAN}Pushing $ahead_count unpushed commit(s) on main...${NC}" - if git push origin main 2>/dev/null; then - pushed_main="✅ $ahead_count pushed" - echo -e " ${GREEN}✅ Main pushed${NC}" - else - pushed_main="❌ push failed" - echo -e " ${RED}❌ Push failed${NC}" - fi - else - pushed_main="up to date" - fi - # Fetch to ensure we have latest remote backup refs git fetch origin 'refs/heads/backup/*:refs/remotes/origin/backup/*' 2>/dev/null || true @@ -113,7 +93,6 @@ backup_repo() { SUMMARY_COMMITS[$SUMMARY_IDX]="0" SUMMARY_LAST_MSG[$SUMMARY_IDX]="$last_msg" SUMMARY_BRANCH[$SUMMARY_IDX]="$LATEST_BACKUP" - SUMMARY_PUSHED[$SUMMARY_IDX]="$pushed_main" SUMMARY_IDX=$((SUMMARY_IDX + 1)) return 0 fi @@ -154,7 +133,6 @@ backup_repo() { SUMMARY_COMMITS[$SUMMARY_IDX]="$commits_since" SUMMARY_LAST_MSG[$SUMMARY_IDX]="$last_msg" SUMMARY_BRANCH[$SUMMARY_IDX]="$BACKUP_BRANCH" - SUMMARY_PUSHED[$SUMMARY_IDX]="$pushed_main" SUMMARY_IDX=$((SUMMARY_IDX + 1)) } @@ -176,27 +154,25 @@ for repo in "${REPOS[@]}"; do SUMMARY_COMMITS[$SUMMARY_IDX]="-" SUMMARY_LAST_MSG[$SUMMARY_IDX]="-" SUMMARY_BRANCH[$SUMMARY_IDX]="-" - SUMMARY_PUSHED[$SUMMARY_IDX]="-" SUMMARY_IDX=$((SUMMARY_IDX + 1)) fi done # Print summary table echo "" -echo -e "${BOLD}┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐${NC}" -echo -e "${BOLD}│ BACKUP SUMMARY $(date '+%Y-%m-%d %H:%M') │${NC}" -echo -e "${BOLD}├──────────────────────────────────┬──────────────────────┬─────────┬────────────────┬──────────────────────────────────┤${NC}" -printf "${BOLD}│ %-32s │ %-20s │ %7s │ %-14s │ %-32s │${NC}\n" "Repository" "Backup Status" "New" "Main Push" "Last Commit" -echo -e "${BOLD}├──────────────────────────────────┼──────────────────────┼─────────┼────────────────┼──────────────────────────────────┤${NC}" +echo -e "${BOLD}┌──────────────────────────────────────────────────────────────────────────────────────────────────────┐${NC}" +echo -e "${BOLD}│ BACKUP SUMMARY $(date '+%Y-%m-%d %H:%M') │${NC}" +echo -e "${BOLD}├──────────────────────────────────┬──────────────────────┬─────────┬──────────────────────────────────┤${NC}" +printf "${BOLD}│ %-32s │ %-20s │ %7s │ %-32s │${NC}\n" "Repository" "Backup Status" "New" "Last Commit" +echo -e "${BOLD}├──────────────────────────────────┼──────────────────────┼─────────┼──────────────────────────────────┤${NC}" for ((i=0; i