a361791ca98af0188613d52ac64b0168ff25f519 jcasper Mon Feb 3 19:55:02 2025 -0800 A few more places where git wants explicit --track=direct, no ticket diff --git src/utils/qa/weeklybld/revertCommits.csh src/utils/qa/weeklybld/revertCommits.csh index 82b4b7e57c3..2162c4731e0 100755 --- src/utils/qa/weeklybld/revertCommits.csh +++ src/utils/qa/weeklybld/revertCommits.csh @@ -17,33 +17,33 @@ echo "BRANCHNN=$BRANCHNN" #make sure origin/* is up to date echo "git fetch to be sure origin/* is up-to-date" git fetch if ($status) then echo "unexpected error running git fetch." exit 1 endif #see if branch exists set x=`git branch | grep "^. v${BRANCHNN}_branch"` if ("$x" == "") then # branch does not exist, create it echo "v${BRANCHNN}_branch does not exist, creating as a tracking branch." - git checkout -tb v${BRANCHNN}_branch origin/v${BRANCHNN}_branch + git checkout --track=direct -b v${BRANCHNN}_branch origin/v${BRANCHNN}_branch if ($status) then - echo "error running: git checkout -tb v${BRANCHNN}_branch origin/v${BRANCHNN}_branch" + echo "error running: git checkout --track=direct -b v${BRANCHNN}_branch origin/v${BRANCHNN}_branch" exit 1 endif else if ("$x" != "* v${BRANCHNN}_branch") then # switch to branch echo "v${BRANCHNN}_branch exists, checking it out." git checkout v${BRANCHNN}_branch if ($status) then echo "error running: git checkout v${BRANCHNN}_branch" exit 1 endif else echo "v${BRANCHNN}_branch exists, and is already checked out." endif endif