diff options
Diffstat (limited to 'internal/askcli/taskexec.go')
| -rw-r--r-- | internal/askcli/taskexec.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/internal/askcli/taskexec.go b/internal/askcli/taskexec.go index 0b68e3b..4eed461 100644 --- a/internal/askcli/taskexec.go +++ b/internal/askcli/taskexec.go @@ -77,17 +77,25 @@ func (e Executor) Run(ctx context.Context, args []string, stdin io.Reader, stdou if err != nil { return 1, fmt.Errorf("%s: task binary lookup failed: %w", executor.label(), err) } + gitRoot, gitErr := executor.detectRepoRoot(ctx) repoRoot := "" if _, ok := taskProjectFromContext(ctx); !ok { - repoRoot, err = executor.detectRepoRoot(ctx) - if err != nil { - return 1, fmt.Errorf("%s: must be run inside a git repository: %w", executor.label(), err) + if gitErr != nil { + return 1, fmt.Errorf("%s: must be run inside a git repository: %w", executor.label(), gitErr) } + repoRoot = gitRoot } taskArgs, err := executor.taskArgs(ctx, repoRoot, args) if err != nil { return 1, fmt.Errorf("%s: %w", executor.label(), err) } + if gitErr == nil { + unlockAsk, lerr := acquireAskRepoLock(ctx, gitRoot) + if lerr != nil { + return 1, fmt.Errorf("%s: %w", executor.label(), lerr) + } + defer func() { _ = unlockAsk() }() + } if err := executor.runCommand(ctx, taskPath, taskArgs, stdin, stdout, stderr); err != nil { return exitCodeFor(err), nil } |
