Re: [PATCH] archive: fix misleading error message

From: Martin Ågren <martin.agren@gmail.com>
Date: Oct 4, 2024, 10:07 UTC
Message-ID: <CAN0heSoN-iEdzj1BTw6eRDvRzLkK_oXdSwaG=hxeZUQiYvWZUg@mail.gmail.com>
In-Reply-To: <faed1d0e-86a8-4dcd-a27f-19dcd9f89f37@web.de>

On Thu, 3 Oct 2024 at 17:51, René Scharfe <l.s.r@web.de> wrote:

Show 5 quoted lines

>
> The error message added by 296743a7ca (archive: load index before
> pathspec checks, 2024-09-21) is misleading: unpack_trees() is not
> touching the working tree at all here, but just loading a tree into
> the index.  Correct it.

Show 5 quoted lines

>                 init_tree_desc(&t, &tree->object.oid, tree->buffer, tree->size);
>                 if (unpack_trees(1, &t, &opts))
> -                       die(_("unable to checkout working tree"));
> +                       die(_("failed to unpack tree object %s"),
> +                           oid_to_hex(&tree->object.oid));

The existing instance of this message isn't translated, so it'll still be a new string to translate. Anyway, it's good to use the same wording here as elsewhere.

There's also a "failed to unpack trees", but here, we're indeed unpacking *one* tree.

Good catch!

Martin