I have a repository in Git, where a large number of files are flagged as being edited by Git Gui, a dialog comes up when I click on one of them containing:
"No differences detected.
filename.h has no changes.
The modification date of this file was updated by another
application, but the context within the file has not changed.
A rescan will be automatically started to find other files which
may have the stame state."
If I click on the Ok button the application rescans and displays exactly the same results which presents and endless loop because any file with this condition presents the same dialog.
Is there any way I can remove these automatically from the scan by ignoring white space ?
Check first if your git config --global core.autocrlf is set to false.
If not (or if empty), set it to false, clone again your Git repository, and check if the Git GUI persists in its assessment.
The message itself comes from "git-gui/lib/diff.tcl#handle_empty_diff", whose blame view shows 10+ years-old code.
Ironically, there is a commit named "git-gui: Avoid an infinite rescan loop in handle_empty_diff." (commit 584fa9c)
If the index update machinery and
git diffhappen to disagree on whether a particular file is modified, it may causegit-guito enter an infinite index rescan loop, where an empty diff starts a rescan, which finds the same set of files modified, and tries to display the diff for the first one, which happens to be the empty one.
A current example of a possible disagreement point is theautocrlffilter.
This patch breaks the loop by using a global counter to track the auto-rescans. The variable is reset whenever a non-empty diff is displayed.
Another suggested approach, which is based on giving the
--exit-codeargument togit diff, cannot be used, because diff-files seems to trust the timestamps in the index, and returns a non-zero code even if the file is actually unchanged, which essentially defeats the purpose of the auto-rescan logic.
Try using this: git add --renormalize -- :/