diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-11 20:26:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 20:26:55 (GMT) |
| commit | df422678a800ffb1db8f3f146e2786f1cbf0059b (patch) | |
| tree | 893f5099c5d03859d6e21c1b7eb4f501462b9431 /submodule.h | |
| parent | 3943f6caaa7613145448ebdca181e1feaf941a02 (diff) | |
| parent | ac53fe860147636cd8671efe26bd002a6cb5cd13 (diff) | |
| download | git-df422678a800ffb1db8f3f146e2786f1cbf0059b.zip git-df422678a800ffb1db8f3f146e2786f1cbf0059b.tar.gz git-df422678a800ffb1db8f3f146e2786f1cbf0059b.tar.bz2 | |
Merge branch 'bc/object-id'
Conversion from uchar[20] to struct object_id continues.
* bc/object-id:
sha1_name: convert uses of 40 to GIT_SHA1_HEXSZ
sha1_name: convert GET_SHA1* flags to GET_OID*
sha1_name: convert get_sha1* to get_oid*
Convert remaining callers of get_sha1 to get_oid.
builtin/unpack-file: convert to struct object_id
bisect: convert bisect_checkout to struct object_id
builtin/update_ref: convert to struct object_id
sequencer: convert to struct object_id
remote: convert struct push_cas to struct object_id
submodule: convert submodule config lookup to use object_id
builtin/merge-tree: convert remaining caller of get_sha1 to object_id
builtin/fsck: convert remaining caller of get_sha1 to object_id
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index e85b144..f1aa3ff 100644 --- a/submodule.h +++ b/submodule.h @@ -48,7 +48,7 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt, void load_submodule_cache(void); extern void gitmodules_config(void); extern void repo_read_gitmodules(struct repository *repo); -extern void gitmodules_config_sha1(const unsigned char *commit_sha1); +extern void gitmodules_config_oid(const struct object_id *commit_oid); extern int is_submodule_active(struct repository *repo, const char *path); /* * Determine if a submodule has been populated at a given 'path' by checking if |