jw238/simplegit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preserve git merge command diagnostics

Browse Source
This commit is contained in:
Jabberwocky238
2026-07-30 02:46:28 -04:00
parent f1e61bf129
commit 3129660c9e
1 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gitcmd/merge_temprepo.go
+24 -15
View File
@@ -1,14 +1,17 @@
package gitcmd package gitcmd
import ( import (
"errors"
"fmt" "fmt"
"os" "os"
"os/exec"
"path/filepath" "path/filepath"
"strings" "strings"
) )
func commandFailure(operation string, err error, stdout, stderr string) error {
return fmt.Errorf("%s: %w\nstdout:\n%s\nstderr:\n%s",
operation, err, strings.TrimSpace(stdout), strings.TrimSpace(stderr))
}
func (r *Repository) tempWorkingClone(branch string) (temp string, cleanup func(), err error) { func (r *Repository) tempWorkingClone(branch string) (temp string, cleanup func(), err error) {
dir, err := os.MkdirTemp("", "simplegit-temprepo-*") dir, err := os.MkdirTemp("", "simplegit-temprepo-*")
if err != nil { if err != nil {
@@ -25,9 +28,9 @@ func (r *Repository) tempWorkingClone(branch string) (temp string, cleanup func(
} }
func (r *Repository) unmergedPaths(dir string) ([]string, error) { func (r *Repository) unmergedPaths(dir string) ([]string, error) {
out, _, err := NewCommand("diff", "--name-only", "--diff-filter=U").WithDir(dir).RunStdString(r.ctx) out, stderr, err := NewCommand("diff", "--name-only", "--diff-filter=U").WithDir(dir).RunStdString(r.ctx)
if err != nil { if err != nil {
return nil, err return nil, commandFailure("list unmerged paths", err, out, stderr)
} }
var paths []string var paths []string
for _, l := range strings.Split(out, "\n") { for _, l := range strings.Split(out, "\n") {
@@ -55,8 +58,9 @@ func (r *Repository) MergeViaTempRepo(base, head, message, authorName, authorEma
defer cleanup() defer cleanup()
if !noFF && r.isAncestor(baseSHA, headSHA) { if !noFF && r.isAncestor(baseSHA, headSHA) {
if _, _, err := NewCommand("merge", "--ff-only").AddDynamicArguments(headSHA).WithDir(temp).RunStdString(r.ctx); err != nil { stdout, stderr, err := NewCommand("merge", "--ff-only").AddDynamicArguments(headSHA).WithDir(temp).RunStdString(r.ctx)
return nil, fmt.Errorf("merge --ff-only: %w", err) if err != nil {
return nil, commandFailure("merge --ff-only", err, stdout, stderr)
} }
if err := r.pushBack(temp, base, headSHA, baseSHA); err != nil { if err := r.pushBack(temp, base, headSHA, baseSHA); err != nil {
return nil, err return nil, err
@@ -68,22 +72,27 @@ func (r *Repository) MergeViaTempRepo(base, head, message, authorName, authorEma
return &MergeResult{Base: base, Head: head, MergeCommit: hc, FastForward: true}, nil return &MergeResult{Base: base, Head: head, MergeCommit: hc, FastForward: true}, nil
} }
_, _, mergeErr := NewCommand("merge", "--no-ff", "--no-commit"). mergeOut, mergeErrOut, mergeErr := NewCommand("merge", "--no-ff", "--no-commit").
AddDynamicArguments(headSHA).WithDir(temp).RunStdString(r.ctx) AddDynamicArguments(headSHA).WithDir(temp).RunStdString(r.ctx)
if mergeErr != nil { if mergeErr != nil {
conflicts, err := r.unmergedPaths(temp)
var exitErr *exec.ExitError if err != nil {
if !errors.As(mergeErr, &exitErr) { return nil, fmt.Errorf("%w\nmerge stdout:\n%s\nmerge stderr:\n%s",
return nil, fmt.Errorf("merge: %w", mergeErr) err, strings.TrimSpace(mergeOut), strings.TrimSpace(mergeErrOut))
}
if len(conflicts) == 0 {
return nil, commandFailure("merge --no-ff --no-commit", mergeErr, mergeOut, mergeErrOut)
}
abortOut, abortErrOut, abortErr := NewCommand("merge", "--abort").WithDir(temp).RunStdString(r.ctx)
if abortErr != nil {
return nil, commandFailure("merge --abort", abortErr, abortOut, abortErrOut)
} }
conflicts, _ := r.unmergedPaths(temp)
_, _, _ = NewCommand("merge", "--abort").WithDir(temp).RunStdString(r.ctx)
return &MergeResult{Base: base, Head: head, Conflicts: conflicts}, nil return &MergeResult{Base: base, Head: head, Conflicts: conflicts}, nil
} }
treeOut, _, err := NewCommand("write-tree").WithDir(temp).RunStdString(r.ctx) treeOut, treeErrOut, err := NewCommand("write-tree").WithDir(temp).RunStdString(r.ctx)
if err != nil { if err != nil {
return nil, fmt.Errorf("write-tree: %w", err) return nil, commandFailure("write-tree", err, treeOut, treeErrOut)
} }
mergedTree := strings.TrimSpace(treeOut) mergedTree := strings.TrimSpace(treeOut)
commitSHA, err := r.commitTree(mergedTree, message, authorName, authorEmail, temp, baseSHA, headSHA) commitSHA, err := r.commitTree(mergedTree, message, authorName, authorEmail, temp, baseSHA, headSHA)