Merge branch 'lineends' of https://github.com/sharwell/Git-Source-Con…

…trol-Provider
yysun · Feb 12, 2013 · ed84ecc · ed84ecc
2 parents 5b2f9de + 2cc9538
commit ed84ecc
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/GitApi/GitFileStatusTracker.cs b/GitApi/GitFileStatusTracker.cs
@@ -844,6 +844,13 @@ public string DiffFile(string fileName)
                         df.Flush();
                     }
                 }
+
+                // normalize the line endings of the diff so VS doesn't ask to do it for us
+                string text = File.ReadAllText(tmpFileName).Replace("\r\n", "\n").Replace('\r', '\n');
+                // normalize to Environment.NewLine since this is only used for display in the IDE
+                // and we want users to be able to copy from the diff and paste in a document without
+                // changing line endings
+                File.WriteAllText(tmpFileName, text.Replace("\n", Environment.NewLine));
             }
             catch (Exception ex)
             {