mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

archive: fix misleading error message

Browse Source 
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>
This commit is contained in:
René Scharfe
2024-10-03 17:51:01 +02:00
committed by Junio C Hamano
parent 296743a7ca
commit bebf0e2487
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
archive.c
View File

@ -536,7 +536,8 @@ static void parse_treeish_arg(const char **argv,
opts.fn = oneway_merge; opts.fn = oneway_merge;
init_tree_desc(&t, &tree->object.oid, tree->buffer, tree->size); init_tree_desc(&t, &tree->object.oid, tree->buffer, tree->size);
if (unpack_trees(1, &t, &opts)) 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); git_attr_set_direction(GIT_ATTR_INDEX);
} }