diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:10:09 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:57 +0900 |
| commit | 1e43ed986775d8e8ecaef4dac8b98dcbae6298c1 (patch) | |
| tree | ff277db9f9c9fbee8f4a87dc7f6cb8ea0c97a332 /submodule.c | |
| parent | 7422ab50d1011b2b26b59bf11b91a1202618f3e5 (diff) | |
| download | git-1e43ed986775d8e8ecaef4dac8b98dcbae6298c1.tar.gz | |
Convert remaining callers of lookup_commit_reference* to object_id
There are a small number of remaining callers of lookup_commit_reference
and lookup_commit_reference_gently that still need to be converted to
struct object_id. Convert these.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/submodule.c b/submodule.c index 9bdd5f6055..d5c28b9f1b 100644 --- a/submodule.c +++ b/submodule.c @@ -896,17 +896,17 @@ int push_unpushed_submodules(struct oid_array *commits, return ret; } -static int is_submodule_commit_present(const char *path, unsigned char sha1[20]) +static int is_submodule_commit_present(const char *path, struct object_id *oid) { int is_present = 0; - if (!add_submodule_odb(path) && lookup_commit_reference(sha1)) { + if (!add_submodule_odb(path) && lookup_commit_reference(oid->hash)) { /* Even if the submodule is checked out and the commit is * present, make sure it is reachable from a ref. */ struct child_process cp = CHILD_PROCESS_INIT; const char *argv[] = {"rev-list", "-n", "1", NULL, "--not", "--all", NULL}; struct strbuf buf = STRBUF_INIT; - argv[3] = sha1_to_hex(sha1); + argv[3] = oid_to_hex(oid); cp.argv = argv; prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; @@ -937,7 +937,7 @@ static void submodule_collect_changed_cb(struct diff_queue_struct *q, * being moved around. */ struct string_list_item *path; path = unsorted_string_list_lookup(&changed_submodule_paths, p->two->path); - if (!path && !is_submodule_commit_present(p->two->path, p->two->oid.hash)) + if (!path && !is_submodule_commit_present(p->two->path, &p->two->oid)) string_list_append(&changed_submodule_paths, xstrdup(p->two->path)); } else { /* Submodule is new or was moved here */ |