Is there a way for git to create a patch for reviewboard?

Question

I'm currently using the following command:

git diff --no-prefix -w trunk > my_beautiful_code.patch

but get the following error when I upload the diff in reviewboard:

No valid separator after the filename was found in the diff header

Is there a way to wrangle git into doing the right thing? The reviewboard is looking for the exact svn format, I believe. I could clone the svn repo, apply the patch, then make the patch with svn but that is tedious and I'd like a cleaner workflow...

Thanks!

Answer 1

This is not a real answer but partially explains the problem.

This is caused by an unexpected (from the RB server point of view) diff syntax. You are missing some extra information which is normally present in the subversion RB diffs.

See this bug for a workaround:

https://hellosplat.com/s/beanbag/tickets/1918/

The bug description suggests you could switch to git-svn or you can write a simple find/replace script to have the diff prepared and fixed for you before uploading to RB.