diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:27:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:27:06 -0700 |
| commit | 3e30cb0fbf83fd35c70e9697ba8871420d9fed0a (patch) | |
| tree | 340fcafc69da5a6d361f18c31ac0454595da1015 /builtin/unpack-objects.c | |
| parent | Merge branch 'sg/archive-restrict-remote' (diff) | |
| parent | Document some functions defined in object.c (diff) | |
| download | git-3e30cb0fbf83fd35c70e9697ba8871420d9fed0a.tar.gz git-3e30cb0fbf83fd35c70e9697ba8871420d9fed0a.zip | |
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 'builtin/unpack-objects.c')
| -rw-r--r-- | builtin/unpack-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index e6856f18cd..99cde45879 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -497,7 +497,7 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix) int i; unsigned char sha1[20]; - read_replace_refs = 0; + check_replace_refs = 0; git_config(git_default_config, NULL); |