Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: >> Can we fill the gap by saying how seeing the object name of empty >> blob (or worse, tree) instead of 0{40} made "difftool -d" upset? > > Sorry about catching this only now, after the commit hit `next`. > > Filling the gap is a slightly more complicated. > > And now that I looked at the code again, to make sure that I don't say > anything stupid, I realize that I just provided incorrect information in > my reply elsewhere in this thread: Srinidhi's fix is _not_ enough to fix > t7800 with this here patch. > > Your guess was almost spot on: the empty blob would have worked (as in: > not caused an error, but it would have shown incorrect information). The > problem really is the attempt trying to read the empty tree as if it was a > blob. That results in something like this: > > error: unable to read sha1 file of /tmp/git-difftool.O8CoK9/right/intent-to-add (4b825dc642cb6eb9a060e54bf8d69288fbee4904) > error: could not write 'intent-to-add' > > And yes, it would have been good to adjust the commit message as you > suggested. Sorry for not getting to it in time before it hit `next`. > > Do you want me to send out a v5 and drop v4 from `next` in favor of the > new iteration? That would help the future "us" quite a lot. Thanks for carefully thinking it through.