git-p4 and keyword substitution

All,

I was wondering if there is a way to deal with this issue...

It seems that git removes the keyword substitutions from Perforce.
This is fine, except for the fact that it does not remove them from
the p4 client shadow.  So, this causes git-p4 submit to fail whenever
it either deletes a file with keywords (since the file it is deleting
has the keywords and doesn't match) or lines close to the keywords
change, such that applying the patch doesn't work.

A Google search turned up a thread from a few years ago where someone
submitted a patch to make removing the keyword substitutions optional,
but I guess that patch never got accepted, at least not that I can
see.

Is there any other way of dealing with this?

Thanks,

Mike