Repository navigation
Diff() reports renames without DetectRenames() (git's diff.renames default), so it disagrees with Patch() and rename detection can't be turned off #136
Description
Activity
Triage
- Category: Bug
- Priority: Medium.
DetectRenames()does nothing on a default git setup, results depend on the host'sdiff.renames, andDiff()andPatch()disagree. That breaks UIs that pair the file list with hunks. Nothing crashes and no data is lost, so this sits below With log.showSignature=true, Log() throws GitParseException on any signed commit, and Commit() throws after the commit has already been made #135. - Area / suggested assignee:
GitDiffBuilderrename and copy arguments (GitIntegration/Builders/GitDiffBuilder.cs) and theDetectRenames()/DetectCopies()XML docs. Owner: @matt-edmondson - Duplicates / in progress: not a duplicate. It follows up on GitPatchBuilder doesn't pin context lines or rename detection, so host diff.context=0 yields patches Apply can't stage #121, which pinned this in
GitPatchBuilderonly, and belongs to the same family as Status() can silently omit untracked files depending on the host's status.showUntrackedFiles config #112 and With log.showSignature=true, Log() throws GitParseException on any signed commit, and Commit() throws after the commit has already been made #135 (user git config leaking into parsed output). No open PR covers it: Read quoted and " b/"-containing paths in Patch() headers #129, [minor] Read a commit with an empty signature name or email #133 and [patch] Keep the patch-fixture -text rule out of the SDK-managed root .gitattributes #134 are unrelated. - Next step: mirror
GitPatchBuilderby always passing one of--find-copies,--find-renamesor--no-renames. Add tests that run withdiff.renamesset totrue,falseandcopies. It is worth auditing the other builders for the same kind of config dependency (status.renames,color.*,diff.noprefix) in the same pass.
Generated by Claude Code
What's wrong
GitDiffBuilder(GitIntegration/Builders/GitDiffBuilder.cs~L172-180) adds--find-renames/--find-copiesonly when requested and never passes--no-renames. Git has defaulteddiff.renames=truesince 2.9, so rename detection is effectively always on, and its behavior depends on the host's config.GitPatchBuilderalready pins this (arguments.Add(_detectRenames ? "--find-renames" : "--no-renames"), the #121 fix), so the two builders now disagree.Failure scenario (reproduced with a library-level test)
old.txt, thengit mv old.txt new.txt.repo.Diff().Staged()— noDetectRenames()— returnsRenamed old.txt -> new.txt.repo.Patch().Staged()returnsAdded new.txt; Deleted old.txt.Consequences:
DetectRenames()is a no-op in a default git setup; callers cannot turn rename detection off.Diff()and hunks fromPatch()can't match entries up.diff.renames=falseturns renames off;diff.renames=copiesemits copy (C) entries withoutDetectCopies().Suggested fix
Always set rename detection explicitly, mirroring
GitPatchBuilder: emit--find-copiesif_detectCopies, else--find-renamesif_detectRenames, else--no-renames. Update theDetectRenames()/DetectCopies()XML docs to state detection is off unless requested, regardless ofdiff.renames(matchingIGitPatchBuilder.DetectRenames).Acceptance criteria
Diff().Staged()withoutDetectRenames()reports Added + Deleted for agit mv, matchingPatch().DetectRenames()it reports Renamed.diff.renamesset totrue,falseandcopiesin the repo config and produce identical results.