From patchwork Fri Oct 28 20:14:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glen Choo X-Patchwork-Id: 13024268 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBEF4FA3740 for ; Fri, 28 Oct 2022 20:15:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229911AbiJ1UPQ (ORCPT ); Fri, 28 Oct 2022 16:15:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229629AbiJ1UPF (ORCPT ); Fri, 28 Oct 2022 16:15:05 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FD782FFF3 for ; Fri, 28 Oct 2022 13:15:03 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id j15so7989476wrq.3 for ; Fri, 28 Oct 2022 13:15:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=h+7Pkum1CZN6Gu+UTIed++mZ1ap2H6PJ3zGktaEIrgg=; b=J+RkPwC8c//oScAxxqvrBqAotw3zCdDbtAhT1EPuz5CPfDPMU/pX3SOnUe7vfiiJWM kMcPjHDI1OKM3h+hpFZc69QeoB2aC9P7tqnmjmIkuQWgu5CdIZ9bnZDBYIcXPJy1wubb lPPyEnGlwdgkeEp+t1hJ7KsXYovn1E9AXrDCBrzyyOBdzdkMWOnxQuvbK2FT2DndCmEk Bn++bKwWAKijskbe97qrNUBX5Kr0z37ZgJaCF8ZBjTjaBHtnMvX6MBRGbXQRIonlGH95 y8PeEMYHP1rZFpOl85PLUuOQesEKExRHPDheeqDQez3PDCnf4IbQDWXmvfXDOgoUhIam iZLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h+7Pkum1CZN6Gu+UTIed++mZ1ap2H6PJ3zGktaEIrgg=; b=zZ7Z/gGSdixPnXDQGBD74gruD2kRQQas3Aw1dP/KYbqryk7Vr7GP7KuuQjknsVd/65 bGsBVKNPcHbZ4Chigyr0fuPZ4AnB3RZkfRILzQyM6dbL9f0AEALxyriKNp3kjFdEJuT2 jJUCogwLJldnU3/KvdRFhKZhRgL2QGeG/rmcUHFecoaSha2HZTzM2LbB90Euh1ufRhPU T+vSsPzUcWcYIbdNUE2J23hFVKbVeNbqi5MUlDRjUzwvK/mT9S+ZNgSm6jHpK6fH20+P m4r+FIXt4dL9E4s4NmWn68JWCopVYIpvDd2Gw/fbuqj6TsD3SrwmL1ZB5OcRzcGH6BZP aOZA== X-Gm-Message-State: ACrzQf1p0TikfyMdXYz0YrQrnhYjoIN5bP+sibweCg0JUgi1ymDtskRM lnI68pRi8Q+toV2i1P1DxMKu5I+94G4= X-Google-Smtp-Source: AMsMyM57ku7f7Vnn3Zabun7Na1NP/1ExD03Y8hULzAHJ4gpqAV4kLh1DC4PKyDhVnJXsT+4/5A17WA== X-Received: by 2002:adf:e610:0:b0:236:737f:8e5d with SMTP id p16-20020adfe610000000b00236737f8e5dmr620507wrm.316.1666988102876; Fri, 28 Oct 2022 13:15:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x18-20020adfdcd2000000b00236863c02f5sm4247288wrm.96.2022.10.28.13.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 13:15:02 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Fri, 28 Oct 2022 20:14:53 +0000 Subject: [PATCH v3 5/8] submodule: return target of submodule symref Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Philippe Blain , Jonathan Tan , Glen Choo , Glen Choo Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo From: Glen Choo resolve_gitlink_ref() can tell us which oid the submodule ref is pointing to, but in a future commit, we would also like to know the symbolic ref target if we are checking a symbolic ref. Teach resolve_gitlink_ref() to "return" the symbolic ref's target via an "out" parameter. This changes resolve_gitlink_ref()'s signature so that new callers trying to use the old signature will be stopped by the compiler. If we returned the target instead (just like refs_resolve_ref_unsafe()), we would be more consistent with refs_resolve_ref_unsafe(), but callers expecting the old signature will get the opposite return value from what they expect (since exit code 0 means success, but NULL pointer means failure). We should do this refactor once we think that nobody will try to use the old signature. Signed-off-by: Glen Choo --- builtin/submodule--helper.c | 8 +++++--- builtin/update-index.c | 4 ++-- combine-diff.c | 3 ++- diff-lib.c | 2 +- dir.c | 2 +- object-file.c | 2 +- read-cache.c | 4 ++-- refs.c | 10 ++++++---- refs.h | 5 ++++- unpack-trees.c | 3 ++- 10 files changed, 26 insertions(+), 17 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index c974206cad4..9ca138374b7 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2533,7 +2533,8 @@ static int update_submodule(struct update_data *update_data) if (update_data->just_cloned) oidcpy(&update_data->suboid, null_oid()); - else if (resolve_gitlink_ref(update_data->sm_path, "HEAD", &update_data->suboid)) + else if (resolve_gitlink_ref(update_data->sm_path, "HEAD", + &update_data->suboid, NULL)) return die_message(_("Unable to find current revision in submodule path '%s'"), update_data->displaypath); @@ -2560,7 +2561,8 @@ static int update_submodule(struct update_data *update_data) update_data->sm_path); } - if (resolve_gitlink_ref(update_data->sm_path, remote_ref, &update_data->oid)) + if (resolve_gitlink_ref(update_data->sm_path, remote_ref, + &update_data->oid, NULL)) return die_message(_("Unable to find %s revision in submodule path '%s'"), remote_ref, update_data->sm_path); @@ -3305,7 +3307,7 @@ static void die_on_repo_without_commits(const char *path) strbuf_addstr(&sb, path); if (is_nonbare_repository_dir(&sb)) { struct object_id oid; - if (resolve_gitlink_ref(path, "HEAD", &oid) < 0) + if (resolve_gitlink_ref(path, "HEAD", &oid, NULL) < 0) die(_("'%s' does not have a commit checked out"), path); } strbuf_release(&sb); diff --git a/builtin/update-index.c b/builtin/update-index.c index b62249905f1..19a21a4586c 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -339,7 +339,7 @@ static int process_directory(const char *path, int len, struct stat *st) if (S_ISGITLINK(ce->ce_mode)) { /* Do nothing to the index if there is no HEAD! */ - if (resolve_gitlink_ref(path, "HEAD", &oid) < 0) + if (resolve_gitlink_ref(path, "HEAD", &oid, NULL) < 0) return 0; return add_one_path(ce, path, len, st); @@ -365,7 +365,7 @@ static int process_directory(const char *path, int len, struct stat *st) } /* No match - should we add it as a gitlink? */ - if (!resolve_gitlink_ref(path, "HEAD", &oid)) + if (!resolve_gitlink_ref(path, "HEAD", &oid, NULL)) return add_one_path(NULL, path, len, st); /* Error out. */ diff --git a/combine-diff.c b/combine-diff.c index b0ece954808..88efcaeefa7 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1060,7 +1060,8 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, elem->mode = canon_mode(st.st_mode); } else if (S_ISDIR(st.st_mode)) { struct object_id oid; - if (resolve_gitlink_ref(elem->path, "HEAD", &oid) < 0) + if (resolve_gitlink_ref(elem->path, "HEAD", &oid, + NULL) < 0) result = grab_blob(opt->repo, &elem->oid, elem->mode, &result_size, NULL, NULL); diff --git a/diff-lib.c b/diff-lib.c index 2edea41a234..ac94b6234ca 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -53,7 +53,7 @@ static int check_removed(const struct index_state *istate, const struct cache_en * a directory --- the blob was removed! */ if (!S_ISGITLINK(ce->ce_mode) && - resolve_gitlink_ref(ce->name, "HEAD", &sub)) + resolve_gitlink_ref(ce->name, "HEAD", &sub, NULL)) return 1; } return 0; diff --git a/dir.c b/dir.c index d604d1bab98..81d232424c1 100644 --- a/dir.c +++ b/dir.c @@ -3251,7 +3251,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up) struct object_id submodule_head; if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) && - !resolve_gitlink_ref(path->buf, "HEAD", &submodule_head)) { + !resolve_gitlink_ref(path->buf, "HEAD", &submodule_head, NULL)) { /* Do not descend and nuke a nested git work tree. */ if (kept_up) *kept_up = 1; diff --git a/object-file.c b/object-file.c index 5e309602346..a3c6580c16e 100644 --- a/object-file.c +++ b/object-file.c @@ -2522,7 +2522,7 @@ int index_path(struct index_state *istate, struct object_id *oid, strbuf_release(&sb); break; case S_IFDIR: - return resolve_gitlink_ref(path, "HEAD", oid); + return resolve_gitlink_ref(path, "HEAD", oid, NULL); default: return error(_("%s: unsupported file type"), path); } diff --git a/read-cache.c b/read-cache.c index 32024029274..4c1bf33ef48 100644 --- a/read-cache.c +++ b/read-cache.c @@ -285,7 +285,7 @@ static int ce_compare_gitlink(const struct cache_entry *ce) * * If so, we consider it always to match. */ - if (resolve_gitlink_ref(ce->name, "HEAD", &oid) < 0) + if (resolve_gitlink_ref(ce->name, "HEAD", &oid, NULL) < 0) return 0; return !oideq(&oid, &ce->oid); } @@ -781,7 +781,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, namelen = strlen(path); if (S_ISDIR(st_mode)) { - if (resolve_gitlink_ref(path, "HEAD", &oid) < 0) + if (resolve_gitlink_ref(path, "HEAD", &oid, NULL) < 0) return error(_("'%s' does not have a commit checked out"), path); while (namelen && path[namelen-1] == '/') namelen--; diff --git a/refs.c b/refs.c index 1491ae937eb..a32a25ccb69 100644 --- a/refs.c +++ b/refs.c @@ -1904,19 +1904,21 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags, } int resolve_gitlink_ref(const char *submodule, const char *refname, - struct object_id *oid) + struct object_id *oid, const char **target_out) { struct ref_store *refs; int flags; + const char *target; refs = get_submodule_ref_store(submodule); if (!refs) return -1; - - if (!refs_resolve_ref_unsafe(refs, refname, 0, oid, &flags) || - is_null_oid(oid)) + target = refs_resolve_ref_unsafe(refs, refname, 0, oid, &flags); + if (!target || is_null_oid(oid)) return -1; + if (target_out) + *target_out = target; return 0; } diff --git a/refs.h b/refs.h index 8958717a17d..d5c32fac000 100644 --- a/refs.h +++ b/refs.h @@ -137,9 +137,12 @@ int peel_iterated_oid(const struct object_id *base, struct object_id *peeled); * submodule (which must be non-NULL). If the resolution is * successful, return 0 and set oid to the name of the object; * otherwise, return a non-zero value. + * + * FIXME: Return "target" just like refs_resolve_ref_unsafe(). This will be + * safe to do once we merge resolve_gitlink_ref() into master. */ int resolve_gitlink_ref(const char *submodule, const char *refname, - struct object_id *oid); + struct object_id *oid, const char **target); /* * Return true iff abbrev_name is a possible abbreviation for diff --git a/unpack-trees.c b/unpack-trees.c index bae812156c4..db12bfcaffd 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -2288,7 +2288,8 @@ static int verify_clean_subdirectory(const struct cache_entry *ce, if (S_ISGITLINK(ce->ce_mode)) { struct object_id oid; - int sub_head = resolve_gitlink_ref(ce->name, "HEAD", &oid); + int sub_head = + resolve_gitlink_ref(ce->name, "HEAD", &oid, NULL); /* * If we are not going to update the submodule, then * we don't care.