Re: [PATCH 2/3] do not write null sha1s to on-disk index

Jeff King wrote:

Hrm. But your output does not say there is a conflict. It says you have
a local modification and it does not try the merge:

That's probably operator error on my part when gathering output to
paste into the email.

In other words, nothing to see there. :)  Sorry for the confusion.

[...]

If I try to apply it, I get a real conflict:

[...]

Although running "git am --abort" after that does seem to produce the
"cache entry has null sha1" error.

Yep, that is what my report should have said.

'night,
Jonathan