{"thread":{"id":"14359","subject":"[git-p4] Cannot submit to perforce","startedAt":"2008-07-08T23:30:44Z","lastAt":"2008-07-08T23:30:44Z","messageCount":1,"participants":["Benjamin Sergeant"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"82648","messageId":"1621f9fa0807081630o5308d035o49a2b2dd60cceffe@mail.gmail.com","threadId":"14359","inReplyTo":null,"subject":"[git-p4] Cannot submit to perforce","fromName":"Benjamin Sergeant","fromEmail":"bsergean@gmail.com","sentAt":"2008-07-08T23:30:44Z","receivedAt":"2008-07-08T23:30:44Z","isPatch":false,"sender":{"key":"bsergean@gmail.com","avatar":null},"body":"With today's git:\n\nI'm trying to reproduce the git commands git-p4 execute.\n\n$ git branch -r\n  p4/HEAD\n  p4/master\n\n$ git diff-tree -r\n\"0a41bb5b8387517ca5c45c56544e978b2f82f021^\"..\"0a41bb5b8387517ca5c45c56544e978b2f82f021\"\n:000000 100755 0000000000000000000000000000000000000000\n67406438a99bb212502eb3f3581527f046a96964 A\nr3d/Viewer/qtgui/tools/buildrss.py\n...\n...\n...\n\n$ git format-patch -k --stdout\n\"0a41bb5b8387517ca5c45c56544e978b2f82f021^\"..\"0a41bb5b8387517ca5c45c56544e978b2f82f021\"\n| git apply --check -\n<stdin>:225: trailing whitespace.\n#\n<stdin>:233: trailing whitespace.\n#\n<stdin>:273: trailing whitespace.\n\n<stdin>:275: trailing whitespace.\n\n<stdin>:295: trailing whitespace.\n\nerror: r3d/Viewer/qtgui/tools/buildrss.py: already exists in working directory\n...\n...\n...\n\nFor me the \"already exists in working directory\" means we are not in\nthe right branch, and that we are trying to apply the same commit on\nthe master branch ?\n\nIf I issue git-p4 submit I have basically the same output, I say\n\"[s]kip this patch\" and it ends with:\n\"\"\"\nSome files in your working directory are modified and different than\nwhat is in your index. You can use git update-index <filename> to\nbring the index up-to-date or stash away all your changes with git\nstash.\n\"\"\"\nIf I retry git-p4 submit with doing the stash, sometimes the perforce\nsubmit goes fine, sometimes not... ???\n\nThanks for any help,\nBenjamin.\n"}]}