Kirill Smelkov [off-list ref] writes:
On Sat, Dec 18, 2010 at 07:23:29PM -0800, Junio C Hamano wrote:
quoted
Kirill Smelkov [off-list ref] writes:
quoted
Thanks for your ACK and for the explanation.
My last patches to git were blame related so semi-intuitively I knew
that invalid sha1 are coming from files in worktree. Your description
makes things much more clear and I'd put it into patch log as well.
What is the best practice for this? For me to re-roll, or for Junio to
merge texts?
Re-rolling to explain changes in your own words is preferred; thanks.
I see, thanks.
I'm not that familiar with git internals involved, so here is updated
patch with added paragraph about "df->sha1_valid=0 means files from
worktree with unknown sha1", and appropriate excerpt from Jeff's post.
That's the most reasonable I could come up with.
Thanks,
Kirill
P.S. please don't forget to pick patch 1 which is unchanged.
Here is how I would describe it.
commit 87bb04bb760659dd33d7a173333329cd900620a9
Author: Kirill Smelkov [off-list ref]
Date: Sat Dec 18 17:54:12 2010 +0300
fill_textconv(): Don't get/put cache if sha1 is not valid
When blaming files in the working tree, the filespec is marked with
!sha1_valid, as we have not given the contents an object name yet. The
function to cache textconv results (keyed on the object name), however,
didn't check this condition, and ended up on storing the cached result
under a random object name.
Signed-off-by: Kirill Smelkov [off-list ref]
On Sun, Dec 19, 2010 at 06:41:22PM -0800, Junio C Hamano wrote:
quoted
I'm not that familiar with git internals involved, so here is updated
patch with added paragraph about "df->sha1_valid=0 means files from
worktree with unknown sha1", and appropriate excerpt from Jeff's post.
That's the most reasonable I could come up with.
[...]
Here is how I would describe it.
commit 87bb04bb760659dd33d7a173333329cd900620a9
Author: Kirill Smelkov [off-list ref]
Date: Sat Dec 18 17:54:12 2010 +0300
fill_textconv(): Don't get/put cache if sha1 is not valid
When blaming files in the working tree, the filespec is marked with
!sha1_valid, as we have not given the contents an object name yet. The
function to cache textconv results (keyed on the object name), however,
didn't check this condition, and ended up on storing the cached result
under a random object name.
Signed-off-by: Kirill Smelkov [off-list ref]
FWIW, I think that is a good description.
-Peff
On Sun, Dec 19, 2010 at 11:46:56PM -0500, Jeff King wrote:
On Sun, Dec 19, 2010 at 06:41:22PM -0800, Junio C Hamano wrote:
quoted
quoted
I'm not that familiar with git internals involved, so here is updated
patch with added paragraph about "df->sha1_valid=0 means files from
worktree with unknown sha1", and appropriate excerpt from Jeff's post.
That's the most reasonable I could come up with.
[...]
Here is how I would describe it.
commit 87bb04bb760659dd33d7a173333329cd900620a9
Author: Kirill Smelkov [off-list ref]
Date: Sat Dec 18 17:54:12 2010 +0300
fill_textconv(): Don't get/put cache if sha1 is not valid
When blaming files in the working tree, the filespec is marked with
!sha1_valid, as we have not given the contents an object name yet. The
function to cache textconv results (keyed on the object name), however,
didn't check this condition, and ended up on storing the cached result
under a random object name.
Signed-off-by: Kirill Smelkov [off-list ref]
FWIW, I think that is a good description.
Junio, Jeff, thanks for re-wording it. Though I think my v2 text was
saying the same, only with more info + examples. My english is pretty
bad this days, so I kind of understand why it was tempting to be redone :)
Thanks anyway, and for picking this into next,
Kirill
P.S. somehow 'Acked-by: Jeff King [off-list ref]' was dropped.