From faaaa538a9ced9bfb54b74c79f0c87596f67309c Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 25 Apr 2013 09:35:11 -0700
Subject: [PATCH] Enable git-diffs by default

---
 CHANGELOG.md                                    | 2 ++
 src/packages/git-diff/lib/git-diff.coffee       | 6 +-----
 src/packages/git-diff/spec/git-diff-spec.coffee | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0b792e2c..64e0e18c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Added: Editor gutter now displays Git status for lines
+
 * Improved: Startup time
 * Added: SQL bundle now included
 * Added: PEG.js bundle now included
diff --git a/src/packages/git-diff/lib/git-diff.coffee b/src/packages/git-diff/lib/git-diff.coffee
index 127eb4b81..ce1372a46 100644
--- a/src/packages/git-diff/lib/git-diff.coffee
+++ b/src/packages/git-diff/lib/git-diff.coffee
@@ -1,12 +1,8 @@
 GitDiffView = require './git-diff-view'
 
 module.exports =
-  configDefaults:
-    enabled: false
-
   activate: ->
     return unless git?
-    return unless config.get('git-diff.enabled')
 
     rootView.eachEditor (editor) =>
-      new GitDiffView(editor) if git? and editor.getPane()?
+      new GitDiffView(editor) if git? and editor.attached and editor.getPane()?
diff --git a/src/packages/git-diff/spec/git-diff-spec.coffee b/src/packages/git-diff/spec/git-diff-spec.coffee
index a800ac37a..59ff4d01a 100644
--- a/src/packages/git-diff/spec/git-diff-spec.coffee
+++ b/src/packages/git-diff/spec/git-diff-spec.coffee
@@ -5,7 +5,6 @@ describe "GitDiff package", ->
   editor = null
 
   beforeEach ->
-    config.set('git-diff.enabled', true)
     window.rootView = new RootView
     rootView.attachToDom()
     rootView.open('sample.js')