[FFmpeg-devel] switching to git - eventually?

Michael Niedermayer michaelni
Fri Jan 11 13:00:33 CET 2008

On Fri, Jan 11, 2008 at 09:58:19AM +0000, Robert Swain wrote:
> Hello,
> On 07/01/2008, Michael Niedermayer <michaelni at gmx.at> wrote:
> > On Mon, Jan 07, 2008 at 02:11:54AM +0200, Uoti Urpala wrote:
> > > On Sun, 2008-01-06 at 12:40 +0000, M?ns Rullg?rd wrote:
> > > > - We must be reasonably confident developers know how to use git, or
> > > >   there will be trouble.
> > >
> > > Getting more developers to access the svn repository through git-svn
> > > could be a good first step.
> >
> > providing some idiot proof docs on how to set up git-svn with working push
> > to svn would surely help here ...
> Indeed. I have had to make a set of incremental, dependent patches
> (i.e. apply them in order) myself and I decided to take the
> opportunity to look at git. In some situations its a bit awkward but
> here are some notes I made. I also have a query about the desired
> format of diffs that I will elaborate after the notes.
> (note: commands prefixed with $)
> 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.

> // 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 ...

Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

There will always be a question for which you do not know the correct awnser.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20080111/0357055a/attachment.pgp>

More information about the ffmpeg-devel mailing list