diff --git a/spec/git-spec.coffee b/spec/git-spec.coffee index 8c89ab106..b40f68182 100644 --- a/spec/git-spec.coffee +++ b/spec/git-spec.coffee @@ -136,7 +136,7 @@ describe "Git", -> it "displays a confirmation dialog by default", -> spyOn(atom, 'confirm').andCallFake ({buttons}) -> buttons.OK() - atom.config.set('editor.confirmCheckoutHead', true) + atom.config.set('editor.confirmCheckoutHeadRevision', true) repo.checkoutHeadForEditor(editor) @@ -144,7 +144,7 @@ describe "Git", -> it "does not display a dialog when confirmation is disabled", -> spyOn(atom, 'confirm') - atom.config.set('editor.confirmCheckoutHead', false) + atom.config.set('editor.confirmCheckoutHeadRevision', false) repo.checkoutHeadForEditor(editor) diff --git a/src/editor-view.coffee b/src/editor-view.coffee index 580a312b7..41fa8b3e3 100644 --- a/src/editor-view.coffee +++ b/src/editor-view.coffee @@ -58,7 +58,7 @@ class EditorView extends View softWrapAtPreferredLineLength: false scrollSensitivity: 40 useHardwareAcceleration: true - confirmCheckoutHead: true + confirmCheckoutHeadRevision: true invisibles: eol: '\u00ac' space: '\u00b7' diff --git a/src/git.coffee b/src/git.coffee index 8a74f519f..b8e35911f 100644 --- a/src/git.coffee +++ b/src/git.coffee @@ -104,7 +104,7 @@ class Git editor.buffer.reload() if editor.buffer.isModified() @checkoutHead(filePath) - if atom.config.get('editor.confirmCheckoutHead') + if atom.config.get('editor.confirmCheckoutHeadRevision') atom.confirm message: 'Confirm Checkout HEAD Revision' detailedMessage: "Are you sure you want to discard all changes to \"#{fileName}\" since the last Git commit?"