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-config.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-config.h')
| -rw-r--r-- | submodule-config.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/submodule-config.h b/submodule-config.h index 233bfcb..4ffa2fa 100644 --- a/submodule-config.h +++ b/submodule-config.h @@ -37,15 +37,15 @@ extern int parse_submodule_config_option(const char *var, const char *value); extern int submodule_config_option(struct repository *repo, const char *var, const char *value); extern const struct submodule *submodule_from_name( - const unsigned char *commit_or_tree, const char *name); + const struct object_id *commit_or_tree, const char *name); extern const struct submodule *submodule_from_path( - const unsigned char *commit_or_tree, const char *path); + const struct object_id *commit_or_tree, const char *path); extern const struct submodule *submodule_from_cache(struct repository *repo, - const unsigned char *treeish_name, + const struct object_id *treeish_name, const char *key); -extern int gitmodule_sha1_from_commit(const unsigned char *commit_sha1, - unsigned char *gitmodules_sha1, - struct strbuf *rev); +extern int gitmodule_oid_from_commit(const struct object_id *commit_oid, + struct object_id *gitmodules_oid, + struct strbuf *rev); extern void submodule_free(void); #endif /* SUBMODULE_CONFIG_H */ |