mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 10:15:32 -05:00
Stefan HallerandClaude Opus 5
34d41b5d51
GIT_DIR and GIT_WORK_TREE tell git where our repo is, and every command we run inherits them — including the ones we point at a submodule or another worktree. git resolves those against our repo instead, and says nothing about it: with GIT_DIR set, `git -C mysub log -1` reports the superproject's commit. So opening lazygit with --git-dir/--work-tree quietly broke resolving submodule conflicts, stashing and resetting a submodule, and detaching another worktree; the worktree list came back claiming every worktree shared our git dir. Drop the two variables from the commands that address another repo. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
117 lines
4.0 KiB
Go
117 lines
4.0 KiB
Go
package git_commands
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/go-errors/errors"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
|
|
"github.com/jesseduffield/lazygit/pkg/env"
|
|
"github.com/samber/lo"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestSubmoduleGetConflictCommits(t *testing.T) {
|
|
type scenario struct {
|
|
testName string
|
|
output string
|
|
expectedBase string
|
|
expectedOurs string
|
|
expectedTheirs string
|
|
}
|
|
|
|
scenarios := []scenario{
|
|
{
|
|
testName: "all three stages present (both modified)",
|
|
output: "160000 aaaaaaa 1\tmysub\x00160000 bbbbbbb 2\tmysub\x00160000 ccccccc 3\tmysub\x00",
|
|
expectedBase: "aaaaaaa",
|
|
expectedOurs: "bbbbbbb",
|
|
expectedTheirs: "ccccccc",
|
|
},
|
|
{
|
|
testName: "only our and their stages (added on both sides)",
|
|
output: "160000 bbbbbbb 2\tmysub\x00160000 ccccccc 3\tmysub\x00",
|
|
expectedBase: "",
|
|
expectedOurs: "bbbbbbb",
|
|
expectedTheirs: "ccccccc",
|
|
},
|
|
}
|
|
|
|
for _, s := range scenarios {
|
|
t.Run(s.testName, func(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"ls-files", "-u", "-z", "--", "mysub"}, s.output, nil)
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
base, ours, theirs, err := instance.GetConflictCommits("mysub")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, s.expectedBase, base)
|
|
assert.Equal(t, s.expectedOurs, ours)
|
|
assert.Equal(t, s.expectedTheirs, theirs)
|
|
runner.CheckForMissingCalls()
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestSubmoduleGetConflictCommitsError(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"ls-files", "-u", "-z", "--", "mysub"}, "", errors.New("error"))
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
_, _, _, err := instance.GetConflictCommits("mysub")
|
|
assert.Error(t, err)
|
|
runner.CheckForMissingCalls()
|
|
}
|
|
|
|
func TestSubmoduleGetCommitSummary(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"-c", "log.showsignature=false", "-C", "mysub", "log", "--format=%h %s", "--max-count=1", "bbbbbbb"}, "bbbbbbb the subject\n", nil)
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
summary, err := instance.GetCommitSummary("mysub", "bbbbbbb")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, "bbbbbbb the subject", summary)
|
|
runner.CheckForMissingCalls()
|
|
}
|
|
|
|
func TestSubmoduleCheckoutConflictCommit(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"-C", "mysub", "checkout", "bbbbbbb"}, "", nil)
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
assert.NoError(t, instance.CheckoutConflictCommit("mysub", "bbbbbbb"))
|
|
runner.CheckForMissingCalls()
|
|
}
|
|
|
|
// A command that runs inside a submodule mustn't inherit the GIT_DIR and
|
|
// GIT_WORK_TREE that say where the superproject is; git would answer it from
|
|
// there instead, and the answer would look perfectly plausible.
|
|
func TestSubmoduleCommandDoesntUseOurGitLocation(t *testing.T) {
|
|
t.Setenv(env.GitDirEnvVar, "/path/to/repo/.git")
|
|
t.Setenv(env.GitWorkTreeEnvVar, "/path/to/repo")
|
|
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectFunc("has neither GIT_DIR nor GIT_WORK_TREE", func(cmdObj *oscommands.CmdObj) bool {
|
|
return lo.NoneBy(cmdObj.GetEnvVars(), func(envVar string) bool {
|
|
return strings.HasPrefix(envVar, env.GitDirEnvVar+"=") ||
|
|
strings.HasPrefix(envVar, env.GitWorkTreeEnvVar+"=")
|
|
})
|
|
}, "bbbbbbb the subject\n", nil)
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
_, err := instance.GetCommitSummary("mysub", "bbbbbbb")
|
|
assert.NoError(t, err)
|
|
runner.CheckForMissingCalls()
|
|
}
|
|
|
|
func TestSubmoduleConflictSideLog(t *testing.T) {
|
|
runner := oscommands.NewFakeRunner(t).
|
|
ExpectGitArgs([]string{"-C", "mysub", "log", "--oneline", "--color=always", "ccccccc..bbbbbbb"}, "bbbbbbb left\n", nil)
|
|
instance := buildSubmoduleCommands(commonDeps{runner: runner})
|
|
|
|
output, err := instance.ConflictSideLog("mysub", "bbbbbbb", "ccccccc")
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, "bbbbbbb left\n", output)
|
|
runner.CheckForMissingCalls()
|
|
}
|