From 2e940b4426d2c91622096a5e73d274ff1cc76458 Mon Sep 17 00:00:00 2001
From: Josh Abernathy <joshaber@gmail.com>
Date: Tue, 1 Mar 2016 22:16:43 -0500
Subject: [PATCH] Merge pull request #11022 from atom/windows-git-fixes

Windows git fixes
---
 package.json                | 2 +-
 src/git-repository-async.js | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1bef04dc1..7795abe5c 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "less-cache": "0.23",
     "line-top-index": "0.2.0",
     "marked": "^0.3.4",
-    "nodegit": "0.11.5",
+    "nodegit": "0.11.6",
     "normalize-package-data": "^2.0.0",
     "nslog": "^3",
     "oniguruma": "^5",
diff --git a/src/git-repository-async.js b/src/git-repository-async.js
index 894b1216a..91b78e0c5 100644
--- a/src/git-repository-async.js
+++ b/src/git-repository-async.js
@@ -596,7 +596,15 @@ export default class GitRepositoryAsync {
       .then(([repo, headCommit]) => Promise.all([repo, headCommit.getTree()]))
       .then(([repo, tree]) => {
         const options = new Git.DiffOptions()
+        options.contextLines = 0
+        options.flags = Git.Diff.OPTION.DISABLE_PATHSPEC_MATCH
         options.pathspec = this.relativize(_path, repo.workdir())
+        if (process.platform === 'win32') {
+          // Ignore eol of line differences on windows so that files checked in
+          // as LF don't report every line modified when the text contains CRLF
+          // endings.
+          options.flags |= Git.Diff.OPTION.IGNORE_WHITESPACE_EOL
+        }
         return Git.Diff.treeToWorkdir(repo, tree, options)
       })
       .then(diff => this._getDiffLines(diff))