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?ds=inline;hp=-c

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
---

60b3e9b959f4423f6927ef77e7097bea3ad24e45
diff --combined builtin/replace.c
index 748c6ca954,15bec80b7d..b58c714cb8
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@@ -358,10 -358,10 +358,10 @@@ static void check_one_mergetag(struct c
  
  	/* iterate over new parents */
  	for (i = 1; i < mergetag_data->argc; i++) {
 -		unsigned char sha1[20];
 -		if (get_sha1(mergetag_data->argv[i], sha1) < 0)
 +		struct object_id oid;
 +		if (get_sha1(mergetag_data->argv[i], oid.hash) < 0)
  			die(_("Not a valid object name: '%s'"), mergetag_data->argv[i]);
 -		if (!hashcmp(tag->tagged->sha1, sha1))
 +		if (!oidcmp(&tag->tagged->oid, &oid))
  			return; /* found */
  	}
  
@@@ -440,6 -440,7 +440,7 @@@ int cmd_replace(int argc, const char **
  	};
  
  	check_replace_refs = 0;
+ 	git_config(git_default_config, NULL);
  
  	argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);