~gitpocket/gitpocket

1

fix(basin): merge-tree without quiet for older git

commit
099159809d1f25a9cbe4a40199da509a4d23c317 browse tree
parent
cc889b9d11711b46113e21bd9b7245cf33f916ec
author
james <j@cpl0.zip>
signature
none
date
2026-09-30 21:17 UTC

1 files changed, +1 −1

git.go modified

@@ -133,7 +133,7 @@ func (g Git) DiffRange(base, head string) ([]File, error) {
133133 }
134134
135135 func (g Git) Mergeable(target, head string) bool {
136- _, err := g.run(nil, "merge-tree", "--write-tree", "--quiet", "refs/heads/"+target, head)
136+ _, err := g.run(nil, "merge-tree", "--write-tree", "refs/heads/"+target, head)
137137 return err == nil
138138 }
139139