mirror of
https://github.com/git/git.git
synced 2024-10-28 04:49:43 +01:00
Merge branch 'rs/archive-with-attr-pathspec-fix'
Message update. * rs/archive-with-attr-pathspec-fix: archive: fix misleading error message
This commit is contained in:
commit
12841c449c
1 changed files with 2 additions and 1 deletions
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue