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

Merge branch 'jk/core-use-replace-refs'

Browse Source 
A new configuration variable core.usereplacerefs has been added,
primarily to help server installations that want to ignore the
replace mechanism altogether.

* jk/core-use-replace-refs:
  add core.usereplacerefs config option
  check_replace_refs: rename to read_replace_refs
  check_replace_refs: fix outdated comment
This commit is contained in:
Junio C Hamano
2018-08-15 15:08:22 -07:00
parent a14a9bfc13 da4398d6a0
commit 1689c22c1c
16 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
log-tree.c
View File

@ -92,7 +92,7 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
if (starts_with(refname, git_replace_ref_base)) {
struct object_id original_oid;
if (!check_replace_refs)
if (!read_replace_refs)
return 0;
if (get_oid_hex(refname + strlen(git_replace_ref_base),
&original_oid)) {