summaryrefslogtreecommitdiff
path: root/archive.c
diff options
context:
space:
mode:
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);
}