All geek questions in one place

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

I am currently using the following command:

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

but get the following error when I load diff into the overview:

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

Is there a way to abort git to do the right thing? I believe the review is looking for the exact svn format. I could clone the svn repo, apply the patch, and then make the patch with svn, but this is tedious and I need a cleaner workflow ...

Thanks!

+6
source share
1 answer

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

This is caused by the unexpected (from the perspective of the RB server) diff syntax. You are missing out on any additional information that is usually present in RB subversive activities.

See this error for workaround:

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

The error description assumes that you can switch to git-svn, or you can write a simple search / replace script so that it is prepared and corrected for you before uploading to RB.

+5
source

Source: https://habr.com/ru/post/918311/

More articles:


All Articles