Thanks for the tip about keyword expansion. Fortunately for me we don't use those. 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. Lance On Jul 9, 2010, at 3:21 PM, Tor Arvid Lund wrote: > On Fri, Jul 9, 2010 at 5:05 PM, Thomas Berg <merlin66b@xxxxxxxxx> wrote: >> Hi, >> >> On Fri, May 28, 2010 at 2:30 AM, Lance Linder <llinder@xxxxxxxxx> wrote: >>> Until recently I have been successfully using git-p4 with much joy and >>> happiness. Then suddenly git-p4 submit started throwing "Command >>> failed: p4 diff -du ..." when ever I delete or move a file. >>> >>> We recently upgraded our perforce server ( Rev. >>> P4D/NTX86/2009.2/238357 (2010/03/15) ). It was about this time that >>> the problem came up. First thing I did of course was upgrade to the >>> latest version of git ( now on 1.7.1 ) but the problem still persists. >>> Next I updated my p4 client ( Rev. P4/MACOSX104U/2009.2/238357 >>> (2010/03/15) ) but still same problem. All other submits work fine as >>> long as there are not any deletions or moves. >> [...] >>> >>> Anyone else seeing these issues? > > Hi. Are any of you using Perforce's "keyword expansion" stuff? I mean > the thing where you put a: > > $Id$ > > keyword in a file, and it expands to something like: > > $Id: //depot/test/main.c#10 $ > > If I do that (and, unfortunately, people at my $dayjob do do that), > I'm almost sure that this is the error I got... The reason seems to be > that when git imports the file from P4, the keyword expansions get > stripped off (as in: reset to just $Id$). And then the p4 diff fails > if the $Id$ type lines are included in the diff. When deleting a file, > all lines are included in the diff... > > It hasn't itched me hard enough that I have tried hard to solve it > (unfortunately). I simply do deletes from P4 instead of git-p4 :-/ > > -Tor Arvid- > >> Indeed, we just upgraded our Perforce server too, and now I'm getting >> this exact error. Did you find a solution to the problem? >> >> If not I'm very interested in solving it. Seems like the p4 diff >> command has changed behaviour and broken the git-p4 script. >> >> Cheers, >> 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 >> -- 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