Hi Ben, On Fri, May 11, 2018 at 5:56 AM, Ben Peart <Ben.Peart@xxxxxxxxxxxxx> wrote: > After performing a merge that has conflicts git status will, by default, > attempt to detect renames which causes many objects to be examined. In a > virtualized repo, those objects do not exist locally so the rename logic > triggers them to be fetched from the server. This results in the status call > taking hours to complete on very large repos vs seconds with this patch. > > Add a new config status.renames setting to enable turning off rename detection > during status and commit. This setting will default to the value of > diff.renames. > > Add a new config status.renamelimit setting to to enable bounding the time > spent finding out inexact renames during status and commit. This setting will > default to the value of diff.renamelimit. > > Add --no-renames command line option to status that enables overriding the > config setting from the command line. Add --find-renames[=<n>] command line > option to status that enables detecting renames and optionally setting the > similarity index. Any chance I could get you to re-wrap this at a smaller column width? Doesn't fit in my (80-char) terminal when I run `git log`; a couple lines run over by a couple characters. (Sorry for not noticing this earlier) > This patch depends on em/status-rename-config I'd leave this line for the notes. It's useful information now, but won't be to someone looking at the commit a year from now, so it probably doesn't belong in the commit message. With those two changes: Reviewed-by: Elijah Newren <newren@xxxxxxxxx>