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 | |
| parent | d552f8df1b2749b58e386dff98027c64f35cdbd1 (diff) | |
| parent | 33bef7ea256e620c579aeff0e672b0becc79c75c (diff) | |
| download | git-3e30cb0fbf83fd35c70e9697ba8871420d9fed0a.tar.gz | |
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')
| -rw-r--r-- | builtin/fsck.c | 2 | ||||
| -rw-r--r-- | builtin/index-pack.c | 2 | ||||
| -rw-r--r-- | builtin/pack-objects.c | 2 | ||||
| -rw-r--r-- | builtin/prune.c | 2 | ||||
| -rw-r--r-- | builtin/replace.c | 2 | ||||
| -rw-r--r-- | builtin/unpack-objects.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 73afedd129..fc150c8821 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -630,7 +630,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) struct alternate_object_database *alt; errors_found = 0; - read_replace_refs = 0; + check_replace_refs = 0; argc = parse_options(argc, argv, prefix, fsck_opts, fsck_usage, 0); diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 2f37a38fbc..a6b1c17996 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1502,7 +1502,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) if (argc == 2 && !strcmp(argv[1], "-h")) usage(index_pack_usage); - read_replace_refs = 0; + check_replace_refs = 0; reset_pack_idx_option(&opts); git_config(git_index_pack_config, &opts); diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 8b89f8121a..93095c1198 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2612,7 +2612,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) OPT_END(), }; - read_replace_refs = 0; + check_replace_refs = 0; reset_pack_idx_option(&pack_idx_opts); git_config(git_pack_config, NULL); diff --git a/builtin/prune.c b/builtin/prune.c index 25f1477edb..144a3bdb33 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -150,7 +150,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) expire = ULONG_MAX; save_commit_buffer = 0; - read_replace_refs = 0; + check_replace_refs = 0; init_revisions(&revs, prefix); argc = parse_options(argc, argv, prefix, options, prune_usage, 0); diff --git a/builtin/replace.c b/builtin/replace.c index 80b152a86c..b62420a01a 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -178,7 +178,7 @@ int cmd_replace(int argc, const char **argv, const char *prefix) OPT_END() }; - read_replace_refs = 0; + check_replace_refs = 0; argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0); 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); |