object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY

Stop having GET_OID_ONLY_TO_DIE imply GET_OID_QUIETLY in get_oid_with_context_1(). The *_DIE flag was added in 33bd598c390 (sha1_name.c: teach lookup context to get_sha1_with_context(), 2012-07-02), and then later tweaked in 7243ffdd78d (get_sha1: avoid repeating ourselves via ONLY_TO_DIE, 2016-09-26). Everything in that commit makes sense, but only for callers that expect to fail in an initial call to get_oid_with_context_1(), e.g. as "git show 0017" does via handle_revision_arg(), and then would like to call get_oid_with_context_1() again via this maybe_die_on_misspelt_object_name() function. In the subsequent commit we'll add a new caller that expects to call this only once, but who would still like to have all the error messaging that GET_OID_ONLY_TO_DIE gives it, in addition to any regular errors. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Dec 28, 2021 at 14:28 UTC 9ce6000cb7a023e16ae1743df760edaae1c5ca1d
1 file changed +1 -4
object-name.c
+1 -4
@@ -1795,9 +1795,6 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
1795 const char *cp;
1796 int only_to_die = flags & GET_OID_ONLY_TO_DIE;
1797
1798 - if (only_to_die)
1799 - flags |= GET_OID_QUIETLY;
1800 -
1798 memset(oc, 0, sizeof(*oc));
1799 oc->mode = S_IFINVALID;
1800 strbuf_init(&oc->symlink_path, 0);
@@ -1932,7 +1929,7 @@ void maybe_die_on_misspelt_object_name(struct repository *r,
1929 {
1930 struct object_context oc;
1931 struct object_id oid;
1935 - get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE,
1932 + get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE | GET_OID_QUIETLY,
1933 prefix, &oid, &oc);
1934 }
1935