Merge branch 'rs/archive-with-attr-pathspec-fix'

gitster · gitster · commit 12841c449c8d · 2024-10-04T14:21:40.000-07:00
Message update.

* rs/archive-with-attr-pathspec-fix:
  archive: fix misleading error message
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,8 @@ static void parse_treeish_arg(const char **argv,`
`536`	`536`	`opts.fn = oneway_merge;`
`537`	`537`	`init_tree_desc(&t, &tree->object.oid, tree->buffer, tree->size);`
`538`	`538`	`if (unpack_trees(1, &t, &opts))`
`539`		`- die(_("unable to checkout working tree"));`
	`539`	`+ die(_("failed to unpack tree object %s"),`
	`540`	`+ oid_to_hex(&tree->object.oid));`
`540`	`541`
`541`	`542`	`git_attr_set_direction(GIT_ATTR_INDEX);`
`542`	`543`	`}`