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/coBranch.csh src/utils/qa/weeklybld/coBranch.csh index 3dbea4151e4..6edf639c5d6 100755 --- src/utils/qa/weeklybld/coBranch.csh +++ src/utils/qa/weeklybld/coBranch.csh @@ -13,31 +13,31 @@ #unpack the new branch on BUILDDIR for beta # for later: is this faster to co on kkstore or not? cd $BUILDDIR set branch = "v"$BRANCHNN"_branch" if ( -d $branch ) then echo "removing old branch dir. [${0}: `date`]" rm -fr $branch endif mkdir -p $branch cd $branch echo "Checking out branch $BRANCHNN. [${0}: `date`]" git clone -q $GITSHAREDREPO kent chmod g+w kent cd kent -git checkout -tb $branch origin/$branch +git checkout --track=direct -b $branch origin/$branch set err = $status if ( $err ) then echo "error running git clone and checkout of kent in $BUILDDIR/$branch : $err [${0}: `date`]" exit 1 endif cd .. # configure settings like SSL and BAM in common.mk echo "Configuring settings on branch $BRANCHNN in $BUILDDIR/$branch [${0}: `date`]" $WEEKLYBLD/configureSandbox.csh . $WEEKLYBLD/defaultBuildSettings.mk echo "Done checking out branch $BRANCHNN in $BUILDDIR/$branch [${0}: `date`]" echo "Now you should go and do build on beta! [${0}: `date`]"