mirror of
https://gitea.com/gitea/tea.git
synced 2025-12-11 00:44:00 +01:00
016e068c60
## Problem
Tea commands fail when run from git worktrees with the error:
Remote repository required: Specify ID via --repo or execute from a
local git repo.
Even though the worktree is in a valid git repository with remotes
configured.
Additionally, `tea pr create` was missing context validation, showing
cryptic errors like `"path segment [0]
is empty"` instead of helpful messages.
## Root Cause
1. **Worktree issue**: go-git's `PlainOpenWithOptions` was not
configured to read the `commondir` file that
git worktrees use. This file points to the main repository's `.git`
directory where remotes are actually
stored (worktrees don't have their own remotes).
2. **PR create issue**: Missing `ctx.Ensure()` validation meant errors
weren't caught early with clear
messages.
## Solution
### 1. Enable worktree support (`modules/git/repo.go`)
```go
EnableDotGitCommonDir: true, // Enable commondir support for worktrees
This tells go-git to:
- Read the commondir file in .git/worktrees/<name>/commondir
- Follow the reference (typically ../..) to the main repository
- Load remotes from the main repo's config
2. Add context validation (cmd/pulls/create.go)
ctx.Ensure(context.CtxRequirement{
LocalRepo: true,
RemoteRepo: true,
})
Provides clear error messages and matches the pattern used in pr
checkout (fixed in commit 0970b945 from
2020).
3. Add test coverage (modules/git/repo_test.go)
- Creates a real git repository with a worktree
- Verifies that RepoFromPath() can open the worktree
- Confirms that Config() correctly reads remotes from main repo
Test Results
Without fix:
❌ FAIL: Should NOT be empty, but was map[]
With fix:
✅ PASS: TestRepoFromPath_Worktree (0.12s)
Manual test in worktree:
cd /path/to/worktree
tea pr create --title "test"
# Now works! ✅
Checklist
- Tested manually in a git worktree
- Added test case that fails without the fix
- All existing tests pass
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-on: https://gitea.com/gitea/tea/pulls/850
Reviewed-by: techknowlogick <techknowlogick@noreply.gitea.com>
Co-authored-by: Brandon Martin <brandon@codedmart.com>
Co-committed-by: Brandon Martin <brandon@codedmart.com>
77 lines
1.8 KiB
Go
77 lines
1.8 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package pulls
|
|
|
|
import (
|
|
stdctx "context"
|
|
|
|
"code.gitea.io/sdk/gitea"
|
|
"code.gitea.io/tea/cmd/flags"
|
|
"code.gitea.io/tea/modules/context"
|
|
"code.gitea.io/tea/modules/interact"
|
|
"code.gitea.io/tea/modules/task"
|
|
"github.com/urfave/cli/v3"
|
|
)
|
|
|
|
// CmdPullsCreate creates a pull request
|
|
var CmdPullsCreate = cli.Command{
|
|
Name: "create",
|
|
Aliases: []string{"c"},
|
|
Usage: "Create a pull-request",
|
|
Description: "Create a pull-request in the current repo",
|
|
Action: runPullsCreate,
|
|
Flags: append([]cli.Flag{
|
|
&cli.StringFlag{
|
|
Name: "head",
|
|
Usage: "Branch name of the PR source (default is current one). To specify a different head repo, use <user>:<branch>",
|
|
},
|
|
&cli.StringFlag{
|
|
Name: "base",
|
|
Aliases: []string{"b"},
|
|
Usage: "Branch name of the PR target (default is repos default branch)",
|
|
},
|
|
&cli.BoolFlag{
|
|
Name: "allow-maintainer-edits",
|
|
Aliases: []string{"edits"},
|
|
Usage: "Enable maintainers to push to the base branch of created pull",
|
|
Value: true,
|
|
},
|
|
}, flags.IssuePRCreateFlags...),
|
|
}
|
|
|
|
func runPullsCreate(_ stdctx.Context, cmd *cli.Command) error {
|
|
ctx := context.InitCommand(cmd)
|
|
ctx.Ensure(context.CtxRequirement{
|
|
LocalRepo: true,
|
|
RemoteRepo: true,
|
|
})
|
|
|
|
// no args -> interactive mode
|
|
if ctx.NumFlags() == 0 {
|
|
if err := interact.CreatePull(ctx); err != nil && !interact.IsQuitting(err) {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// else use args to create PR
|
|
opts, err := flags.GetIssuePRCreateFlags(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var allowMaintainerEdits *bool
|
|
if ctx.IsSet("allow-maintainer-edits") {
|
|
allowMaintainerEdits = gitea.OptionalBool(ctx.Bool("allow-maintainer-edits"))
|
|
}
|
|
|
|
return task.CreatePull(
|
|
ctx,
|
|
ctx.String("base"),
|
|
ctx.String("head"),
|
|
allowMaintainerEdits,
|
|
opts,
|
|
)
|
|
}
|