acdaa07de466a99a62b4ed7d026d4adb89893584 jcasper Mon Feb 3 19:51:05 2025 -0800 Seems like -t is no longer accepted as meaning --track=direct by git, so being explicit. No ticket. diff --git src/utils/qa/weeklybld/cherryPickCommits.csh src/utils/qa/weeklybld/cherryPickCommits.csh index 8d88e14e55a..0d57db80a02 100755 --- src/utils/qa/weeklybld/cherryPickCommits.csh +++ src/utils/qa/weeklybld/cherryPickCommits.csh @@ -12,33 +12,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