diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:55 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-11 13:26:55 -0700 |
commit | df422678a800ffb1db8f3f146e2786f1cbf0059b (patch) | |
tree | 893f5099c5d03859d6e21c1b7eb4f501462b9431 /repository.c | |
parent | Merge branch 'sb/object-id' (diff) | |
parent | sha1_name: convert uses of 40 to GIT_SHA1_HEXSZ (diff) | |
download | tgif-df422678a800ffb1db8f3f146e2786f1cbf0059b.tar.xz |
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 'repository.c')
-rw-r--r-- | repository.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/repository.c b/repository.c index edca907404..1617467568 100644 --- a/repository.c +++ b/repository.c @@ -158,7 +158,7 @@ int repo_submodule_init(struct repository *submodule, struct strbuf worktree = STRBUF_INIT; int ret = 0; - sub = submodule_from_cache(superproject, null_sha1, path); + sub = submodule_from_cache(superproject, &null_oid, path); if (!sub) { ret = -1; goto out; |