Fix source path for apply in dev mode

Author: akclace

internal/server/apply.go

@@ -198,13 +198,13 @@ func appDefToApplyInfo(appDef *starlarkstruct.Struct) (*types.CreateAppRequest,
 	}, nil
 }
 
-func (s *Server) setupSource(applyPath, branch, commit, gitAuth string, repoCache *RepoCache) (string, string, error) {
+func (s *Server) setupSource(applyPath, branch, commit, gitAuth string, repoCache *RepoCache, isDev bool) (string, string, error) {
 	if !system.IsGit(applyPath) {
 		return filepath.Dir(applyPath), filepath.Base(applyPath), nil
 	}
 
 	branch = cmp.Or(branch, "main")
-	repo, applyFile, _, _, err := repoCache.CheckoutRepo(applyPath, branch, commit, gitAuth, false)
+	repo, applyFile, _, _, err := repoCache.CheckoutRepo(applyPath, branch, commit, gitAuth, isDev)
 	if err != nil {
 		return "", "", err
 	}
@@ -220,7 +220,7 @@ func (s *Server) setupSource(applyPath, branch, commit, gitAuth string, repoCach
 
 func (s *Server) Apply(ctx context.Context, inputTx types.Transaction, applyPath string, appPathGlob string, approve, dryRun, promote bool,
 	reload types.AppReloadOption, branch, commit, gitAuth string, clobber,
-	forceReload bool, lastRunCommitId string, repoCache *RepoCache, dev bool) (*types.AppApplyResponse, []types.AppPathDomain, error) {
+	forceReload bool, lastRunCommitId string, repoCache *RepoCache, isDev bool) (*types.AppApplyResponse, []types.AppPathDomain, error) {
 	var tx types.Transaction
 	var err error
 	if inputTx.Tx == nil {
@@ -265,7 +265,7 @@ func (s *Server) Apply(ctx context.Context, inputTx types.Transaction, applyPath
 		}
 	}
 
-	dir, file, err := s.setupSource(applyPath, branch, commit, gitAuth, repoCache)
+	dir, file, err := s.setupSource(applyPath, branch, commit, gitAuth, repoCache, isDev)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -294,7 +294,7 @@ func (s *Server) Apply(ctx context.Context, inputTx types.Transaction, applyPath
 			return nil, nil, fmt.Errorf("error reading file %s: %w", f, err)
 		}
 
-		fileConfig, err := s.loadApplyInfo(f, fileBytes, branch, dev)
+		fileConfig, err := s.loadApplyInfo(f, fileBytes, branch, isDev)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -370,8 +370,8 @@ func (s *Server) Apply(ctx context.Context, inputTx types.Transaction, applyPath
 	for _, newApp := range newApps {
 		s.Trace().Msgf("Applying create app %s", newApp)
 		applyInfo := applyConfig[newApp]
-		if dev {
-			applyInfo.IsDev = dev // Override the dev status from the apply command cli
+		if isDev {
+			applyInfo.IsDev = isDev // Override the dev status from the apply command cli
 		}
 		res, err := s.CreateAppTx(ctx, tx, newApp.String(), approve, dryRun, applyInfo, repoCache)
 		if err != nil {