mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/replace-refs'

Browse Source 
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
This commit is contained in:
Junio C Hamano
2015-08-03 11:01:10 -07:00
parent a17c56c056 58d121b22b
commit 31a0ad5456
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
log-tree.c
View File

@ -97,11 +97,12 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
assert(cb_data == NULL);
if (starts_with(refname, "refs/replace/")) {
if (starts_with(refname, git_replace_ref_base)) {
struct object_id original_oid;
if (!check_replace_refs)
return 0;
if (get_oid_hex(refname + 13, &original_oid)) {
if (get_oid_hex(refname + strlen(git_replace_ref_base),
&original_oid)) {
warning("invalid replace ref %s", refname);
return 0;
}