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/makeUserApps.csh src/utils/qa/weeklybld/makeUserApps.csh index b9bcd35b98b..b97f7c14e5b 100755 --- src/utils/qa/weeklybld/makeUserApps.csh +++ src/utils/qa/weeklybld/makeUserApps.csh @@ -8,31 +8,31 @@ set ScriptStart=`date` echo "Cleaning out $BUILDDIR/userApps" rm -fr $BUILDDIR/userApps mkdir $BUILDDIR/userApps cd $BUILDDIR/userApps echo "Checking out kent/src branch $BRANCHNN. [${0}: `date`]" set branch = "v"$BRANCHNN"_branch" 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/userApps : $err [${0}: `date`]" exit 1 endif cd .. set BINDIR=linux.$MACHTYPE set DESTDIR=$BUILDDIR/userApps/ # must end in slash because of makefile weirdness rm -rf $DESTDIR$BINDIR mkdir $DESTDIR$BINDIR # configure settings like SSL and BAM in common.mk echo "Configuring settings on userApp sandbox $BRANCHNN $HOST [${0}: `date`]" $WEEKLYBLD/configureSandbox.csh . $WEEKLYBLD/downloadBuildSettings.mk