threads / discuss / 56356
Subject: git read-tree doesn't accept tree-ish
``` git init echo foo > foo git add --all git commit -m 'foo'
echo bar > foo git add --all git commit -m 'bar'
git read-tree HEAD~:foo ``` EXP: Read information about file `foo` into index ACT: `fatal: failed to unpack tree object HEAD~:foo`
I expect it to work because manpage says that `git-read-tree` accepts `<tree-ish>`
Elijah NewrenRe: git read-tree doesn't accept tree-ish
On Mon, Aug 23, 2021 at 10:32 AM Nikita Bobko <nikitabobko@gmail.com> wrote:
> > ``` > git init > echo foo > foo > git add --all > git commit -m 'foo' > > echo bar > foo > git add --all > git commit -m 'bar' > > git read-tree HEAD~:foo > ``` > EXP: Read information about file `foo` into index > ACT: `fatal: failed to unpack tree object HEAD~:foo` > > I expect it to work because manpage says that `git-read-tree` accepts > `<tree-ish>`
HEAD~:foo is not a tree in your example, it's a blob. Try running this: `git cat-file -t HEAD~:foo`, to see the type.
Jeff KingRe: git read-tree doesn't accept tree-ish
On Mon, Aug 23, 2021 at 07:31:29PM +0200, Nikita Bobko wrote:
> ``` > git init > echo foo > foo > git add --all > git commit -m 'foo' > > echo bar > foo > git add --all > git commit -m 'bar' > > git read-tree HEAD~:foo > ``` > EXP: Read information about file `foo` into index > ACT: `fatal: failed to unpack tree object HEAD~:foo` > > I expect it to work because manpage says that `git-read-tree` accepts > `<tree-ish>`
In your example, "foo" is a blob, not a tree. And thus HEAD~:foo is not a tree-ish. Just "HEAD~" would be.
What are you trying to do?
-Peff
Re: git read-tree doesn't accept tree-ish
Yes, now I see. Thanks!
I was trying to read state of a particular directory/file from a particular revision into my index but so far didn't manage to do it reliably.
I was using `git read-tree <hash>:<path>` and it doesn't work for files (because they are blobs not tree-ish as you elaborated it to me) and for directories, in my cases, it fails with not so helpful message: ``` error: Entry '<path>/<subpath>' overlaps with '<path>/<subpath>'. Cannot bind. ```
`git checkout <hash> -- <path>` also doesn't work in my case because if any file is removed in `<hash>` but not in my HEAD then `git checkout` doesn't remove the file in my HEAD
On Mon, Aug 23, 2021 at 8:53 PM Jeff King <peff@peff.net> wrote:
> > On Mon, Aug 23, 2021 at 07:31:29PM +0200, Nikita Bobko wrote: > > > ``` > > git init > > echo foo > foo > > git add --all > > git commit -m 'foo' > > > > echo bar > foo > > git add --all > > git commit -m 'bar' > > > > git read-tree HEAD~:foo > > ``` > > EXP: Read information about file `foo` into index > > ACT: `fatal: failed to unpack tree object HEAD~:foo` > > > > I expect it to work because manpage says that `git-read-tree` accepts > > `<tree-ish>` > > In your example, "foo" is a blob, not a tree. And thus HEAD~:foo > is not a tree-ish. Just "HEAD~" would be. > > What are you trying to do? > > -Peff
Elijah NewrenRe: git read-tree doesn't accept tree-ish
Hi,
On Mon, Aug 23, 2021 at 12:09 PM Nikita Bobko <nikitabobko@gmail.com> wrote:
> > Yes, now I see. Thanks! > > I was trying to read state of a particular directory/file from a > particular revision into my index but so far didn't manage to do it > reliably.
Please don't top-post on this list.
> I was using `git read-tree <hash>:<path>` and it doesn't work for > files (because they are blobs not tree-ish as you elaborated it to me) > and for directories, in my cases, it fails with not so helpful > message: > ``` > error: Entry '<path>/<subpath>' overlaps with '<path>/<subpath>'. Cannot bind. > ``` > > `git checkout <hash> -- <path>` also doesn't work in my case because > if any file is removed in `<hash>` but not in my HEAD then `git > checkout` doesn't remove the file in my HEAD
Have you tried `git restore --source=<hash> -- <path>` ?
Junio C HamanoRe: git read-tree doesn't accept tree-ish
Nikita Bobko <nikitabobko@gmail.com> writes:
> `git checkout <hash> -- <path>` also doesn't work in my case because > if any file is removed in `<hash>` but not in my HEAD then `git > checkout` doesn't remove the file in my HEAD
Look for "--no-overlay" option in "git checkout", perhaps?
Re: git read-tree doesn't accept tree-ish
> Have you tried `git restore --source=<hash> -- <path>` ?
At a glance, it looks what I am looking for
> Look for "--no-overlay" option in "git checkout", perhaps?
Oh, and it works too. So many ways to do almost exactly the same thing...
Anyway, thanks everyone for the help! My issue may be considered as resolved. Now I will dig into manpages and experiments to see which of the suggested variants suits me best
On Mon, Aug 23, 2021 at 9:27 PM Junio C Hamano <gitster@pobox.com> wrote:
> > Nikita Bobko <nikitabobko@gmail.com> writes: > > > `git checkout <hash> -- <path>` also doesn't work in my case because > > if any file is removed in `<hash>` but not in my HEAD then `git > > checkout` doesn't remove the file in my HEAD > > Look for "--no-overlay" option in "git checkout", perhaps?