diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-10-04 14:21:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-10-04 14:21:40 -0700 |
| commit | 12841c449c8d4577b330ee18778eefdf22cd3556 (patch) | |
| tree | 63cb57e8ed6cb9850b3ecc1c2680045a0ab6e583 /archive.c | |
| parent | 4861bbf85a1265c6a0e939674bb4441e748d5542 (diff) | |
| parent | bebf0e248775146cac0b9eee22ed9d75848d636f (diff) | |
| download | git-12841c449c8d4577b330ee18778eefdf22cd3556.tar.gz | |
Merge branch 'rs/archive-with-attr-pathspec-fix'
Message update.
* rs/archive-with-attr-pathspec-fix:
archive: fix misleading error message
Diffstat (limited to 'archive.c')
| -rw-r--r-- | archive.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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); } |