summaryrefslogtreecommitdiffstats
path: root/archive.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2024-10-03 17:51:01 +0200
committerJunio C Hamano <gitster@pobox.com>2024-10-03 18:53:04 +0200
commitbebf0e248775146cac0b9eee22ed9d75848d636f (patch)
treedaa634567553cfcf58fdee0a8672f1176c6bbc69 /archive.c
parentarchive: load index before pathspec checks (diff)
downloadgit-bebf0e248775146cac0b9eee22ed9d75848d636f.tar.xz
git-bebf0e248775146cac0b9eee22ed9d75848d636f.zip
archive: fix misleading error message
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 <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive.c')
-rw-r--r--archive.c3
1 files changed, 2 insertions, 1 deletions
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);
}