Creating CVS-style patch headers with git-diff

From

DCDavid Chanters <david.chanters@googlemail.com>

Date

Jan 8, 2011, 11:23 UTC

Message-ID

<AANLkTinmq=3kJmtSVutf7dHAQ0QL3fr9_E3hZ7gDe1JY@mail.gmail.com>

Hi all,

[ Please Cc me on any replies as I am not subscribed to this list, thanks. ]

git diff

I get patch headers in the form:

diff --git a/foo.c b/foo.c
index 57b9527..a2d947b 100644
--- a/foo.c
+++ b/foo.c

This is fine for git, but if I then want to import the same patch into
CVS I have to either edit the patch, or mess around with the -p option
to patch(1).

I have seen that git-diff has options to change the a/ b/ headers --
can anyone shed some light on this as to what I can do?

The reason I am wanting to do this, is rather than importing
changesets from git -> CVS, I have a git clone outright of a CVS
project (which I update with git-cvsimport) and often want to import
diffs to CVS directly after I'm done, and then I publish my topic
branches in Git when I'm done.  The key thing though is to be able to
apply patches from git -- and I am hoping the easiest thing to do is
to try and get git-diff to change the headers.

Any help greatly received.

Kindly,
David