diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-15 01:27:06 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-15 01:27:06 +0400 |
| commit | 3e30cb0fbf83fd35c70e9697ba8871420d9fed0a (patch) | |
| tree | 340fcafc69da5a6d361f18c31ac0454595da1015 /log-tree.c | |
| parent | d552f8df1b2749b58e386dff98027c64f35cdbd1 (diff) | |
| parent | 33bef7ea256e620c579aeff0e672b0becc79c75c (diff) | |
Merge branch 'mh/replace-refs-variable-rename'
* mh/replace-refs-variable-rename:
Document some functions defined in object.c
Add docstrings for lookup_replace_object() and do_lookup_replace_object()
rename read_replace_refs to check_replace_refs
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index 08970bf46e..5ce217d5eb 100644 --- a/log-tree.c +++ b/log-tree.c @@ -100,7 +100,7 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in if (starts_with(refname, "refs/replace/")) { unsigned char original_sha1[20]; - if (!read_replace_refs) + if (!check_replace_refs) return 0; if (get_sha1_hex(refname + 13, original_sha1)) { warning("invalid replace ref %s", refname); |