open-code-review/internal/diff/git_test.go
kite 450dd6d1d6
chore(ci): fail CI when unapproved non-English text appears in source files (#876)
* fix(prompt): replace the fullwidth colon in the file_read tool description

tools.json advertised the example output as "File:path/to/example.go" with
a fullwidth colon (U+FF1A), while file_read.go actually emits "File: %s".
The description is sent to the model on every review, so the example did
not match the output it was describing.

Also switches action.yml's OCR_LANGUAGE example from 中文 to Chinese, for
the same reason as #861: the value is fed to the LLM and Chinese is what
the rest of the project uses.

* chore(ci): fail CI when CJK characters appear in source files

Comments, identifiers and strings in this repository are meant to be
English, but nothing enforced it — #861 had to clean up leftovers by hand,
and the same drift keeps arriving through generated code and contributions
written internally.

scripts/verify-cjk.go walks the index plus untracked files and reports Han
ideographs, kana, CJK punctuation and fullwidth forms. Written in Go rather
than shell so it does not depend on the container's grep having PCRE, and so
`unicode.Is` decides what counts as CJK instead of a byte range that would
flag the em dashes used throughout the comments. `//go:build ignore` keeps
it out of ./..., so it does not affect go vet, go build or the coverage
threshold.

Untracked files are included (--others --exclude-standard) so a new file is
checked before it lands: while writing this, the script's own comment used
Chinese punctuation as an example and went unreported until it was staged.

Two escape hatches, preferring the narrow one: an `allow-cjk: <reason>`
marker comment on a single line, or a prefix in allowedPrefixes for a whole
tree. 23 existing lines get markers (UTF-8 encoding fixtures, multibyte
truncation fixtures, language-switcher labels, the fullwidth bar used as a
terminal cursor). pages/src/i18n/ is allowlisted as translated UI copy;
extensions/vscode/ is allowlisted TEMPORARILY — its comments, test names
and zh-cn NLS bundle are still Chinese and need a follow-up pass.

Wired into CI next to the license and action-pin checks, plus
`make cjk-check` and `make check` for local runs.

* chore(ci): generalise the CJK check to all non-English text

Addresses the review feedback, and widens the rule that the feedback
exposed.

Review feedback:

- exemptMarker requires its colon, so a bare "allow-cjk" can no longer
  exempt a line without giving a reason.
- The script is named for CJK but missed Hangul.
- git ls-files gains -z, so paths that are not plain ASCII arrive
  unquoted, and its stderr is reported rather than a bare exit status.
- main discarded run()'s error entirely and only called os.Exit(1),
  which is what made the lost stderr invisible in the first place.
- The CI step and AGENTS.md say "unapproved", since escape hatches exist.

The check was skewed by writing system rather than by language. In one
array the 'zh' and 'ja' labels each needed a marker while the adjacent
'ru' label passed untouched, and nine lines of Russian sat in the tree
unflagged: two language-switcher labels and the heading-ID fixtures.
Contributors writing Chinese had to justify every line; contributors
writing Russian had nothing to justify.

The rule is now "a letter outside ASCII", since written English needs no
letter beyond the ASCII 26 -- Cyrillic and Han as much as the diacritics
that spell German or Vietnamese. Scripts are not enumerated, so one
nobody has contributed in yet is covered when it arrives. Common and
Inherited pass, so letterlike symbols (U+2139, U+2113) are not mistaken
for prose, and combining accents are caught, so the decomposed spelling
of an accented letter cannot slip through. Symbols and emoji stay out of
scope by construction: they are not letters.

Renamed to scripts/verify-english-only.go and make english-check, and
the marker to allow-non-english:. Text spelled entirely in ASCII still
takes a dictionary to identify and stays a matter for review.

* docs(agents): restate the English-only rule as rule, homes, hatches

The rule was one dense bullet that led with the detection mechanism and
mentioned the exemptions only in passing, which is the wrong order for
the reader: an agent needs to know where a translation may go before it
needs to know which Unicode scripts are flagged. Split into three.

The homes are now spelled out from what the tree actually holds, rather
than left as "<locale> docs or an i18n table": README and CONTRIBUTING
in zh-CN, ja-JP, ko-KR and ru-RU; the doc pages under
pages/src/content/docs/ in en, zh, ja and ru; the UI copy tables in
pages/src/i18n/. Also why the two are exempt for different reasons --
Markdown by extension, the i18n tables by prefix because they are .ts --
since that decides where a new translation can safely go.

Drops the enumerated list of what "make check" runs. It duplicated the
Makefile, went stale the moment a check was added (this PR had to edit
it), and told an agent nothing it would not read in the output anyway.
What is worth saying is that the target writes to the tree.

* fix(ci): detect U+FE10–FE6F CJK punctuation in english-only check

The vertical forms (U+FE10–FE19), CJK compatibility forms (U+FE30–FE4F)
and small form variants (U+FE50–FE6F) were not caught, even though their
fullwidth counterparts (U+FF00–FFEF) already were. A small question mark
(U+FE56 ﹖) or vertical comma (U+FE10 ︐) left in source reads as correct
English punctuation and is invisible in review — the same class of typo
the fullwidth range already defends against.

Skip U+FE20–FE2F (Combining Half Marks) which are used in Latin text.
2026-08-13 14:43:55 +08:00

540 lines
19 KiB
Go

// SPDX-License-Identifier: Apache-2.0
// Copyright 2026 alibaba/open-code-review Contributors
package diff
import (
"context"
"fmt"
"os"
"os/exec"
"path/filepath"
"strings"
"testing"
"github.com/alibaba/open-code-review/internal/gitcmd"
)
// runGitTest runs a git command in dir and fails the test on error.
func runGitTest(t *testing.T, dir string, args ...string) {
t.Helper()
cmd := exec.Command("git", args...)
cmd.Dir = dir
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("git %v failed: %v\n%s", args, err, out)
}
}
// writeGarbageExternalDiff writes a shell script that emits non-diff output and
// returns its path. When git invokes it via GIT_EXTERNAL_DIFF / diff.external it
// replaces the normal unified-diff machinery, so the output can no longer be
// parsed into model.Diff structs unless the git command opts out with
// --no-ext-diff.
func writeGarbageExternalDiff(t *testing.T) string {
t.Helper()
dir := t.TempDir()
script := filepath.Join(dir, "garbage-diff.sh")
// GIT_EXTERNAL_DIFF programs receive 7 args; we ignore them and print junk.
body := "#!/bin/sh\necho \"not a diff\"\n"
if err := os.WriteFile(script, []byte(body), 0o755); err != nil {
t.Fatalf("write garbage diff script: %v", err)
}
return script
}
// initRepoWithChange creates a real git repository with one committed file and
// an uncommitted working-tree modification, returning the repo dir. There is a
// genuine textual diff between HEAD and the working tree.
func initRepoWithChange(t *testing.T) string {
t.Helper()
repo := t.TempDir()
runGitTest(t, repo, "init", "-q")
runGitTest(t, repo, "config", "user.email", "test@example.com")
runGitTest(t, repo, "config", "user.name", "Test User")
runGitTest(t, repo, "config", "commit.gpgsign", "false")
file := filepath.Join(repo, "sample.txt")
if err := os.WriteFile(file, []byte("line1\nline2\nline3\n"), 0o644); err != nil {
t.Fatalf("write sample.txt: %v", err)
}
runGitTest(t, repo, "add", "sample.txt")
runGitTest(t, repo, "commit", "-q", "-m", "initial commit")
// Working-tree modification: a real, parseable diff vs HEAD.
if err := os.WriteFile(file, []byte("line1\nCHANGED\nline3\n"), 0o644); err != nil {
t.Fatalf("modify sample.txt: %v", err)
}
return repo
}
// initRepoWithNonASCIIChange creates a repository whose changed file path
// contains both non-ASCII characters and Next.js-style route groups. It forces
// Git's default path quoting so tests do not depend on the user's global config.
func initRepoWithNonASCIIChange(t *testing.T) (string, string) {
t.Helper()
repo := t.TempDir()
runGitTest(t, repo, "init", "-q")
runGitTest(t, repo, "config", "user.email", "test@example.com")
runGitTest(t, repo, "config", "user.name", "Test User")
runGitTest(t, repo, "config", "commit.gpgsign", "false")
runGitTest(t, repo, "config", "core.quotepath", "true")
relPath := "src/café/(authenticated)/文件.ts" // allow-non-english: fixture exercises non-ASCII paths
file := filepath.Join(repo, filepath.FromSlash(relPath))
if err := os.MkdirAll(filepath.Dir(file), 0o755); err != nil {
t.Fatalf("create non-ASCII path: %v", err)
}
if err := os.WriteFile(file, []byte("before\n"), 0o644); err != nil {
t.Fatalf("write non-ASCII file: %v", err)
}
runGitTest(t, repo, "add", "--", relPath)
runGitTest(t, repo, "commit", "-q", "-m", "initial commit")
if err := os.WriteFile(file, []byte("after\n"), 0o644); err != nil {
t.Fatalf("modify non-ASCII file: %v", err)
}
return repo, relPath
}
func TestDiffModesPreserveNonASCIIPaths(t *testing.T) {
tests := []struct {
name string
provider func(t *testing.T, repo string, runner *gitcmd.Runner) *Provider
}{
{
name: "workspace",
provider: func(_ *testing.T, repo string, runner *gitcmd.Runner) *Provider {
return NewWorkspaceProvider(repo, runner)
},
},
{
name: "commit",
provider: func(t *testing.T, repo string, runner *gitcmd.Runner) *Provider {
runGitTest(t, repo, "add", "-A")
runGitTest(t, repo, "commit", "-q", "-m", "update non-ASCII file")
return NewCommitProvider(repo, "HEAD", runner)
},
},
{
name: "range",
provider: func(t *testing.T, repo string, runner *gitcmd.Runner) *Provider {
runGitTest(t, repo, "add", "-A")
runGitTest(t, repo, "commit", "-q", "-m", "update non-ASCII file")
return NewProvider(repo, "HEAD~1", "HEAD", runner)
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
repo, relPath := initRepoWithNonASCIIChange(t)
provider := tt.provider(t, repo, gitcmd.New(0))
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff returned error: %v", err)
}
if len(diffs) != 1 {
t.Fatalf("got %d diffs, want 1: %+v", len(diffs), diffs)
}
if diffs[0].NewPath != relPath {
t.Errorf("NewPath = %q, want %q", diffs[0].NewPath, relPath)
}
if diffs[0].NewFileContent != "after\n" {
t.Errorf("NewFileContent = %q, want %q", diffs[0].NewFileContent, "after\n")
}
})
}
}
func TestWorkspaceDiffPreservesNonASCIIUntrackedPath(t *testing.T) {
repo, trackedPath := initRepoWithNonASCIIChange(t)
runGitTest(t, repo, "checkout", "--", trackedPath)
untrackedPath := "src/café/(authenticated)/新增.ts" // allow-non-english: fixture exercises non-ASCII paths
if err := os.WriteFile(filepath.Join(repo, filepath.FromSlash(untrackedPath)), []byte("untracked\n"), 0o644); err != nil {
t.Fatalf("write non-ASCII untracked file: %v", err)
}
provider := NewWorkspaceProvider(repo, gitcmd.New(0))
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff returned error: %v", err)
}
if len(diffs) != 1 {
t.Fatalf("got %d diffs, want 1: %+v", len(diffs), diffs)
}
if diffs[0].NewPath != untrackedPath {
t.Errorf("NewPath = %q, want %q", diffs[0].NewPath, untrackedPath)
}
if diffs[0].NewFileContent != "untracked\n" {
t.Errorf("NewFileContent = %q, want %q", diffs[0].NewFileContent, "untracked\n")
}
}
// TestWorkspaceDiffSurvivesExternalDiffTool guards against issue #82: when a
// user has configured an external diff tool (GIT_EXTERNAL_DIFF or
// diff.external), git diff/show emit the tool's output instead of unified diff
// text, which the parser cannot read -> 0 diffs -> a silent "No files changed".
// Passing --no-ext-diff (and --no-textconv) to every git diff/show call site
// makes the provider immune to the user's diff configuration.
//
// RED (before fix): the workspace diff call sites omit --no-ext-diff, so the
// garbage script's output is returned and len(diffs) == 0 -> this test FAILS.
// GREEN (after fix): --no-ext-diff bypasses the env var, the unified diff is
// produced and parsed, len(diffs) > 0 -> this test PASSES.
func TestWorkspaceDiffSurvivesExternalDiffTool(t *testing.T) {
repo := initRepoWithChange(t)
garbage := writeGarbageExternalDiff(t)
// Activate the user-hostile external diff tool for this test process. The
// provider shells out to git, which inherits this environment.
t.Setenv("GIT_EXTERNAL_DIFF", garbage)
runner := gitcmd.New(0)
provider := NewWorkspaceProvider(repo, runner)
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff returned error: %v", err)
}
if len(diffs) == 0 {
t.Fatalf("expected at least one parsed diff with an external diff tool "+
"active, got 0 -- git diff call sites must pass --no-ext-diff "+
"(issue #82). GIT_EXTERNAL_DIFF=%s", garbage)
}
}
// TestWorkspaceDiffNoCommitsUsesStagedFallback pins the second runGit call in
// workspaceTrackedDiff: in a repository with no commits there is no HEAD, so
// `git diff HEAD` fails, and the staged diff is the only way to review the
// workspace. Removing the `--staged` fallback (as an over-eager "simplification"
// might) makes this return zero diffs.
func TestWorkspaceDiffNoCommitsUsesStagedFallback(t *testing.T) {
repo := t.TempDir()
runGitTest(t, repo, "init", "-q")
// Staged file, no commit yet -> no HEAD. No commit also means no need for
// the user.email/user.name/commit.gpgsign config the committing tests set.
file := filepath.Join(repo, "staged.txt")
if err := os.WriteFile(file, []byte("alpha\nbeta\n"), 0o644); err != nil {
t.Fatalf("write staged.txt: %v", err)
}
runGitTest(t, repo, "add", "staged.txt")
runner := gitcmd.New(0)
provider := NewWorkspaceProvider(repo, runner)
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff returned error: %v", err)
}
if len(diffs) == 0 {
t.Fatalf("expected staged changes to be surfaced in a repo with no commits " +
"(the --staged fallback in workspaceTrackedDiff), got 0 diffs")
}
}
// TestCommitDiffSurvivesExternalDiffTool covers the ModeCommit call site
// (git show <commit>), which likewise must pass --no-ext-diff so that a
// user's external diff tool does not break single-commit analysis.
func TestCommitDiffSurvivesExternalDiffTool(t *testing.T) {
repo := initRepoWithChange(t)
runGitTest(t, repo, "add", "sample.txt")
runGitTest(t, repo, "commit", "-q", "-m", "second commit")
garbage := writeGarbageExternalDiff(t)
t.Setenv("GIT_EXTERNAL_DIFF", garbage)
runner := gitcmd.New(0)
provider := NewCommitProvider(repo, "HEAD", runner)
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff (commit) returned error: %v", err)
}
if len(diffs) == 0 {
t.Fatalf("expected at least one parsed commit diff with an external diff "+
"tool active, got 0 -- git show call site must pass "+
"--no-ext-diff (issue #82). GIT_EXTERNAL_DIFF=%s", garbage)
}
}
func TestCommitDiffTreatsOptionLikeRefAsRevision(t *testing.T) {
repo := initRepoWithChange(t)
pagerPath := filepath.Join(repo, "pwn.sh")
proofPath := filepath.Join(repo, "PROOF")
if err := os.WriteFile(pagerPath, []byte("#!/bin/sh\nprintf pwned > PROOF\n"), 0755); err != nil {
t.Fatalf("write pager: %v", err)
}
runner := gitcmd.New(0)
provider := NewCommitProvider(repo, "-O./pwn.sh", runner)
_, err := provider.GetDiff(context.Background())
if err == nil {
t.Fatal("expected option-like commit ref to fail as an invalid revision")
}
if _, statErr := os.Stat(proofPath); statErr == nil {
t.Fatal("option-like commit ref was interpreted as a git show option")
} else if !os.IsNotExist(statErr) {
t.Fatal(statErr)
}
}
func TestWorkspaceUntrackedSymlinkDoesNotReadExternalTarget(t *testing.T) {
repo := t.TempDir()
runGitTest(t, repo, "init", "-q")
runGitTest(t, repo, "config", "user.email", "test@example.com")
runGitTest(t, repo, "config", "user.name", "Test User")
runGitTest(t, repo, "config", "commit.gpgsign", "false")
if err := os.WriteFile(filepath.Join(repo, "base.txt"), []byte("base\n"), 0o644); err != nil {
t.Fatalf("write base.txt: %v", err)
}
runGitTest(t, repo, "add", "base.txt")
runGitTest(t, repo, "commit", "-q", "-m", "initial commit")
secret := "TOP_SECRET_ISSUE123_SHOULD_NOT_LEAK\n"
outside := filepath.Join(t.TempDir(), "secret.txt")
if err := os.WriteFile(outside, []byte(secret), 0o644); err != nil {
t.Fatalf("write external secret: %v", err)
}
if err := os.Symlink(outside, filepath.Join(repo, "leaked_link")); err != nil {
t.Skipf("symlink not supported: %v", err)
}
provider := NewWorkspaceProvider(repo, gitcmd.New(0))
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff returned error: %v", err)
}
var found bool
for _, d := range diffs {
if strings.Contains(d.Diff, secret) || strings.Contains(d.NewFileContent, secret) {
t.Fatalf("workspace diff leaked external symlink target content: %+v", d)
}
if d.NewPath == "leaked_link" {
found = true
if d.NewFileContent != outside {
t.Fatalf("NewFileContent = %q, want symlink target %q", d.NewFileContent, outside)
}
}
}
if !found {
t.Fatal("expected diff for untracked symlink")
}
}
func TestWorkspaceTrackedFileChangedToSymlinkDoesNotReadExternalTarget(t *testing.T) {
repo := t.TempDir()
runGitTest(t, repo, "init", "-q")
runGitTest(t, repo, "config", "user.email", "test@example.com")
runGitTest(t, repo, "config", "user.name", "Test User")
runGitTest(t, repo, "config", "commit.gpgsign", "false")
victim := filepath.Join(repo, "victim.txt")
if err := os.WriteFile(victim, []byte("original\n"), 0o644); err != nil {
t.Fatalf("write victim.txt: %v", err)
}
runGitTest(t, repo, "add", "victim.txt")
runGitTest(t, repo, "commit", "-q", "-m", "initial commit")
secret := "TRACKED_SYMLINK_SECRET_SHOULD_NOT_LEAK\n"
outside := filepath.Join(t.TempDir(), "secret.txt")
if err := os.WriteFile(outside, []byte(secret), 0o644); err != nil {
t.Fatalf("write external secret: %v", err)
}
if err := os.Remove(victim); err != nil {
t.Fatalf("remove victim.txt: %v", err)
}
if err := os.Symlink(outside, victim); err != nil {
t.Skipf("symlink not supported: %v", err)
}
provider := NewWorkspaceProvider(repo, gitcmd.New(0))
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff returned error: %v", err)
}
var foundSymlinkAdd bool
for _, d := range diffs {
if strings.Contains(d.Diff, secret) || strings.Contains(d.NewFileContent, secret) {
t.Fatalf("workspace diff leaked external symlink target content: %+v", d)
}
if d.NewPath == "victim.txt" && d.IsNew {
foundSymlinkAdd = true
if d.NewFileContent != outside {
t.Fatalf("NewFileContent = %q, want symlink target %q", d.NewFileContent, outside)
}
}
}
if !foundSymlinkAdd {
t.Fatal("expected new-file diff for tracked file changed to symlink")
}
}
// TestRangeDiffDetectsRename guards against issue #99: when a file is renamed
// on the target branch, `ocr review --from master --to BRANCH` must recognize
// the rename and read content at the NEW path. Before the fix the rename could
// surface as delete(old)+add(new) (e.g. diff.renames=false) and the parser's
// broken /dev/null detection sent the deleted half into `git show ref:oldpath`
// -> "WARNING: cannot read file ... exit status 128".
func TestRangeDiffDetectsRename(t *testing.T) {
repo := initRepoWithChange(t)
// Reset the working-tree modification left by the helper.
runGitTest(t, repo, "checkout", "--", "sample.txt")
// Simulate a user config where git does NOT detect renames on its own;
// the provider must force --find-renames.
runGitTest(t, repo, "config", "diff.renames", "false")
// Commit a file large enough for git's similarity detection to work
// (tiny files fall below the rename threshold even for 1-line edits).
var content strings.Builder
for i := 1; i <= 50; i++ {
fmt.Fprintf(&content, "line%d\n", i)
}
orig := filepath.Join(repo, "orig.txt")
if err := os.WriteFile(orig, []byte(content.String()), 0o644); err != nil {
t.Fatalf("write orig.txt: %v", err)
}
runGitTest(t, repo, "add", "orig.txt")
runGitTest(t, repo, "commit", "-q", "-m", "add orig.txt")
// Rename on a feature branch, with a small edit (like the issue repro).
runGitTest(t, repo, "checkout", "-q", "-b", "feature")
runGitTest(t, repo, "mv", "orig.txt", "renamed.txt")
edited := strings.Replace(content.String(), "line25\n", "line25-edited\n", 1)
if err := os.WriteFile(filepath.Join(repo, "renamed.txt"), []byte(edited), 0o644); err != nil {
t.Fatalf("edit renamed.txt: %v", err)
}
runGitTest(t, repo, "add", "-A")
runGitTest(t, repo, "commit", "-q", "-m", "rename orig.txt")
runner := gitcmd.New(0)
provider := NewProvider(repo, "HEAD~1", "feature", runner)
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff (range, rename) returned error: %v", err)
}
if len(diffs) != 1 {
t.Fatalf("expected exactly 1 diff for a rename, got %d: %+v", len(diffs), diffs)
}
d := diffs[0]
if !d.IsRenamed {
t.Errorf("IsRenamed = false, want true")
}
if d.OldPath != "orig.txt" || d.NewPath != "renamed.txt" {
t.Errorf("OldPath/NewPath = %q/%q, want orig.txt/renamed.txt", d.OldPath, d.NewPath)
}
if d.NewFileContent == "" {
t.Errorf("NewFileContent is empty: content at new path was not read at ref")
}
}
// TestRangeDiffSurvivesExternalDiffTool covers the ModeRange call site
// (git diff <base> <to>), which likewise must pass --no-ext-diff so that a
// user's external diff tool does not break range comparisons.
func TestRangeDiffSurvivesExternalDiffTool(t *testing.T) {
repo := initRepoWithChange(t)
// Commit the change so there is a committed delta between two refs.
runGitTest(t, repo, "add", "sample.txt")
runGitTest(t, repo, "commit", "-q", "-m", "second commit")
garbage := writeGarbageExternalDiff(t)
t.Setenv("GIT_EXTERNAL_DIFF", garbage)
runner := gitcmd.New(0)
// Range: HEAD~1..HEAD -> the second commit's change.
provider := NewProvider(repo, "HEAD~1", "HEAD", runner)
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff (range) returned error: %v", err)
}
if len(diffs) == 0 {
t.Fatalf("expected at least one parsed range diff with an external diff "+
"tool active, got 0 -- git diff range call site must pass "+
"--no-ext-diff (issue #82). GIT_EXTERNAL_DIFF=%s", garbage)
}
}
// TestCommitDiffMergeCommitReviewsFirstParentDiff covers `ocr review --commit
// <merge>`: plain `git show` renders merge commits as a combined diff
// ("diff --cc"), which ParseDiffText cannot parse, so the review silently
// reported "No supported files changed" for exactly the commits whose
// conflict resolutions most need review. The provider must pass
// --diff-merges=first-parent so a merge is diffed against its first parent
// in regular unified format.
func TestCommitDiffMergeCommitReviewsFirstParentDiff(t *testing.T) {
repo := t.TempDir()
runGitTest(t, repo, "init", "-q")
runGitTest(t, repo, "config", "user.email", "test@example.com")
runGitTest(t, repo, "config", "user.name", "Test User")
runGitTest(t, repo, "config", "commit.gpgsign", "false")
file := filepath.Join(repo, "conflicted.txt")
write := func(content string) {
t.Helper()
if err := os.WriteFile(file, []byte(content), 0o644); err != nil {
t.Fatalf("write conflicted.txt: %v", err)
}
}
write("line1\nline2\nline3\n")
runGitTest(t, repo, "add", "conflicted.txt")
runGitTest(t, repo, "commit", "-q", "-m", "initial commit")
runGitTest(t, repo, "checkout", "-q", "-b", "feature")
write("line1\nfeature-change\nline3\n")
runGitTest(t, repo, "commit", "-q", "-a", "-m", "feature change")
runGitTest(t, repo, "checkout", "-q", "-")
write("line1\nmain-change\nline3\n")
runGitTest(t, repo, "commit", "-q", "-a", "-m", "main change")
// The merge conflicts; resolving it produces the risky content to review.
mergeCmd := exec.Command("git", "merge", "--no-edit", "feature")
mergeCmd.Dir = repo
if out, err := mergeCmd.CombinedOutput(); err == nil {
t.Fatalf("expected merge to conflict, got success:\n%s", out)
}
write("line1\nresolved-conflict\nline3\n")
runGitTest(t, repo, "add", "conflicted.txt")
runGitTest(t, repo, "commit", "-q", "--no-edit")
runner := gitcmd.New(0)
provider := NewCommitProvider(repo, "HEAD", runner)
diffs, err := provider.GetDiff(context.Background())
if err != nil {
t.Fatalf("GetDiff (merge commit) returned error: %v", err)
}
if len(diffs) != 1 {
t.Fatalf("expected exactly 1 diff for the merge commit, got %d: %+v", len(diffs), diffs)
}
d := diffs[0]
if d.NewPath != "conflicted.txt" {
t.Errorf("NewPath = %q, want conflicted.txt", d.NewPath)
}
if !strings.Contains(d.Diff, "+resolved-conflict") {
t.Errorf("diff does not contain the conflict resolution:\n%s", d.Diff)
}
if d.Insertions != 1 || d.Deletions != 1 {
t.Errorf("Insertions/Deletions = %d/%d, want 1/1", d.Insertions, d.Deletions)
}
if d.NewFileContent == "" {
t.Error("NewFileContent is empty: content was not read at the merge commit")
}
}