Fix "fast path" detection of unaltered files when opening temporary copies

sharwell · sharwell · commit c25c3a7b8962 · 2017-07-01T21:48:08.000-05:00
diff --git a/GitDiffMargin/Git/GitCommands.cs b/GitDiffMargin/Git/GitCommands.cs
@@ -59,9 +59,13 @@ public IEnumerable<HunkRangeInfo> GetGitDiffFor(ITextDocument textDocument, stri
                     yield break;
                 }
 
-                if (retrieveStatus == FileStatus.Unaltered && !textDocument.IsDirty)
+                if (retrieveStatus == FileStatus.Unaltered
+                    && !textDocument.IsDirty
+                    && Path.GetFullPath(filename) == originalPath)
                 {
-                    // truly unaltered
+                    // Truly unaltered. The `IsDirty` check isn't valid for cases where the textDocument is a view of a
+                    // temporary copy of the file, since the temporary copy could have been made using unsaved changes
+                    // and still appear "not dirty".
                     yield break;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,13 @@ public IEnumerable<HunkRangeInfo> GetGitDiffFor(ITextDocument textDocument, stri`
`59`	`59`	`yield break;`
`60`	`60`	`}`
`61`	`61`
`62`		`- if (retrieveStatus == FileStatus.Unaltered && !textDocument.IsDirty)`
	`62`	`+ if (retrieveStatus == FileStatus.Unaltered`
	`63`	`+ && !textDocument.IsDirty`
	`64`	`+ && Path.GetFullPath(filename) == originalPath)`
`63`	`65`	`{`
`64`		`- // truly unaltered`
	`66`	+ // Truly unaltered. The `IsDirty` check isn't valid for cases where the textDocument is a view of a
	`67`	`+ // temporary copy of the file, since the temporary copy could have been made using unsaved changes`
	`68`	`+ // and still appear "not dirty".`
`65`	`69`	`yield break;`
`66`	`70`	`}`
`67`	`71`