On Fri, Jul 9, 2010 at 11:20 PM, Lance Linder <llinder@xxxxxxxxx> wrote:
> Thanks for the tip about keyword expansion. Fortunately for me we don't use those.
We don't either.
> When I was trying to debug this the problem seemed to be that the original file is removed from the local Perforce workspace before the p4 diff command is issued. I am not sure how the server upgrade caused this behavior but it was the only thing that changed when I first started seeing the error.
Hasn't Perforce always deleted files immediately when they are marked
for deletion?
Anyway, as far as I can see from the git-p4 source code, the command
is only used to generate the diff preview in the interactive window
that pops up when you "git p4 submit". So if you replace the line
diff = p4_read_pipe("diff -du ...")
with
diff = ""
it should start working again (the diff preview part will become
empty). I'm unable to test it right now, but fairly sure it will work.
I'll see if I can find a better solution when I have access to the
Perforce server again.
Thomas
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html