Merge branch 'mh/replace-refs'

Add an environment variable to tell Git to look into refs hierarchy
other than refs/replace/ for the object replacement data.

* mh/replace-refs:
Allow to control where the replace refs are looked for

diff --cc builtin/replace.c
Simple merge

diff --cc cache.h
Simple merge

diff --cc log-tree.c
index 01beb11f65b518e382fa01f18f03c5a9f2ddf529,9c25bbc1c5c4b90233ac48f4469cdd7cfe3c68ad..e2f6de73ef1bfee85904708e7c4d97001215bced
--- 1/log-tree.c
--- 2/log-tree.c
+++ b/log-tree.c
@@@ -97,11 -96,12 +97,12 @@@ static int add_ref_decoration(const cha
  
        assert(cb_data == NULL);
  
-       if (starts_with(refname, "refs/replace/")) {
+       if (starts_with(refname, git_replace_ref_base)) {
 -              unsigned char original_sha1[20];
 +              struct object_id original_oid;
                if (!check_replace_refs)
                        return 0;
-               if (get_oid_hex(refname + 13, &original_oid)) {
 -              if (get_sha1_hex(refname + strlen(git_replace_ref_base),
 -                               original_sha1)) {
++              if (get_oid_hex(refname + strlen(git_replace_ref_base),
++                              &original_oid)) {
                        warning("invalid replace ref %s", refname);
                        return 0;
                }

diff --cc refs.c
Simple merge