From bebf0e248775146cac0b9eee22ed9d75848d636f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 3 Oct 2024 17:51:01 +0200 Subject: [PATCH] archive: fix misleading error message MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano --- archive.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/archive.c b/archive.c index a0adb01136..3a32ee48d7 100644 --- a/archive.c +++ b/archive.c @@ -536,7 +536,8 @@ static void parse_treeish_arg(const char **argv, opts.fn = oneway_merge; 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)); git_attr_set_direction(GIT_ATTR_INDEX); }