From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Apr 2016 19:59:07 +0000 (-0700)
Subject: Merge branch 'js/replace-edit-use-editor-configuration'
X-Git-Tag: v2.9.0-rc0~90
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/60b3e9b959f4423f6927ef77e7097bea3ad24e45?hp=9cb50a3ca60a5c5969deb83d11782da26c3bcdb7

Merge branch 'js/replace-edit-use-editor-configuration'

"git replace -e" did not honour "core.editor" configuration.

* js/replace-edit-use-editor-configuration:
replace --edit: respect core.editor
---

diff --git a/builtin/replace.c b/builtin/replace.c
index 748c6ca954..b58c714cb8 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -440,6 +440,7 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
 	};
 
 	check_replace_refs = 0;
+	git_config(git_default_config, NULL);
 
 	argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);