Index: git_cl.py |
diff --git a/git_cl.py b/git_cl.py |
index 4e89e065e73a1d8a2b292a8b3361f0d50a6006ba..9f691763ba21ee060e86eb0044319830fb18cdd5 100755 |
--- a/git_cl.py |
+++ b/git_cl.py |
@@ -245,6 +245,7 @@ class Settings(object): |
self.viewvc_url = None |
self.updated = False |
self.is_gerrit = None |
+ self.git_editor = None |
def LazyUpdateIfNeeded(self): |
"""Updates the settings from a codereview.settings file, if available.""" |
@@ -369,6 +370,12 @@ class Settings(object): |
self.is_gerrit = self._GetConfig('gerrit.host', error_ok=True) |
return self.is_gerrit |
+ def GetGitEditor(self): |
+ """Return the editor specified in the git config, or None if none is.""" |
+ if self.git_editor is None: |
+ self.git_editor = self._GetConfig('core.editor', error_ok=True) |
+ return self.git_editor or None |
+ |
def _GetConfig(self, param, **kwargs): |
self.LazyUpdateIfNeeded() |
return RunGit(['config', param], **kwargs).strip() |
@@ -853,7 +860,8 @@ class ChangeDescription(object): |
if '\nBUG=' not in self._description: |
self.append_footer('BUG=') |
- content = gclient_utils.RunEditor(self._description, True) |
+ content = gclient_utils.RunEditor(self._description, True, |
+ git_editor=settings.GetGitEditor()) |
if not content: |
DieWithError('Running editor failed') |