[FFmpeg-devel] switching to git - eventually?

[Robert Swain]

Hello,

On 11/01/2008, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Fri, Jan 11, 2008 at 09:58:19AM +0000, Robert Swain wrote:

[...]

> > initial checkout:
> > $ git-clone git://git.mplayerhq.hu/ffmpeg ffmpeg-git
>
> as other have already said, this one doesnt allow you to push changes to
> svn. Doesnt matter much for people who dont have svn write access but
> its a big disadvantage for thouse who do.

I didn't know this. How should it be done for pushing to svn? I
suppose this should go into any kind of git-howto.txt as well.

Is there a git repo for ffmpeg-soc?

> [...]
> > // prepare patches for e-mail submission
> > // (note: this creates the patches numbered and in order for easy submission)
> > $ git-format-patch -p origin
> >
> > This is quite nice, however, the default output format of the diffs
> > includes some diffstat cruft (removable by using -p) and some subject
> > line, sender, date and some sort of hash cruft which I haven't figured
> > out how to remove. In a way, it could be nice if I was using git to
> > send the patches via e-mail, but I probably won't. Here's an example:
> >
> > From 2c1ff501a911f61251eb4ccd4e8f90386c178337 Mon Sep 17 00:00:00 2001
> > From: Robert Swain <rob at opendot.cl>
> > Date: Fri, 11 Jan 2008 09:06:52 +0000
> > Subject: [PATCH] Move Kaiser-Bessel Derived window generation to mdct.c
> >
> > I set my user.name and user.email in the git config, hence why they're
> > filled in I suppose. I would like to remove those lines from the diff
> > and ideally have an output identical to svn diff. Is this possible or
> > even desirable?
>
> the git "cruft" does no harm, the diffstat is often even interresting ...
> And i still hope svn will one day be fixed to actually allow patches
> to be applied with proper author information. And all the other details
> like the git commit message properly and automatically extracted and
> used ...

The only way I was considering it to cause harm was through making it
more difficult to apply the patch. I want to make it as easy as
possible for reviewers and committers, hence trying to obtain a diff
closest to the output of `svn diff`. If it is acceptable with all the
mail headers and diffstat info then I will submit patches simply using
git-format-patch as this makes incremental patches really quite easy.

Regards,
Rob