Re: Creating CVS-style patch headers with git-diff

From: Tomas Carnecky <tom@dbservice.com>
Date: Jan 8, 2011, 11:49 UTC
Message-ID: <4D284F57.2000808@dbservice.com>
In-Reply-To: <AANLkTinmq=3kJmtSVutf7dHAQ0QL3fr9_E3hZ7gDe1JY@mail.gmail.com>

  On 1/8/11 12:23 PM, David Chanters wrote:

Show 19 quoted lines

> Hi all,
>
> [ Please Cc me on any replies as I am not subscribed to this list, thanks. ]
>
> I am wondering if I can get git diff to create "CVS-style patches"?
> What do I mean by that?  Well, whenever I do:
>
> 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).

What exactly do you need to change in the patch? Remove the index line? The '--git' string? Remove or change the a/, b/ prefix?

> 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?

Are you maybe looking for the --no-prefix option?

tom