From: Sedat Dilek <sedat.dilek@googlemail.com>
Date: Wed, 15 Jun 2011 21:16:54 GMT
Subject: Re: Patch-level-format conversion
Message-ID: <BANLkTim8bdVGo8u_HzZpE_5+xmPe_O+_Dw@mail.gmail.com>
In-Reply-To: <20110615205507.GB27172@elie>

On Wed, Jun 15, 2011 at 10:55 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:
> (+cc: the git list so others can correct me.  I hope that's okay.)
>
> Hi,
>
> Sedat Dilek wrote:
>
>> I have here a patchset extracted from my own git-repo (via git format-patch).
>>
>> The project for which those patches are want "p0" format, means no
>> ---- a/... +++ b/... but --- ... +++ ...
>>
>> IIRC git does "p1" format as default.
>> Any help? Idea?
>
> If I understand correctly, you are in luck.  The "git format-patch
> --no-prefix" command thanks to Dscho seems to do exactly that:
>
>  $ git log -Sno-prefix -- Documentation/diff-options.txt
>  commit eab9a40b6dd5c1c571b1deb264133db47bb4794d
>  Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
>  Date:   Tue Dec 18 19:32:14 2007 +0000
>
>     Teach diff machinery to display other prefixes than "a/" and "b/"
>
>     With the new options "--src-prefix=<prefix>", "--dst-prefix=<prefix>"
>     and "--no-prefix", you can now control the path prefixes of the diff
>     machinery.  These used to by hardwired to "a/" for the source prefix
>     and "b/" for the destination prefix.
>
>     Initial patch by Pascal Obry.  Sane option names suggested by Linus.
>
>     Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>     Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
>     Signed-off-by: Junio C Hamano <gitster@pobox.com>
>
> Hope that helps.
> Jonathan
>

Hi Jonathan,

I played a bit with git format-patch and git diff and got some helpful
hints from friends of #grml and #quassel.de.
Attached is the README.txt I produced some hours ago.

Regards,
- Sedat -


Q: How to generate freetz-conform patches out of a GIT repository?

A. Follow these instructions.

### Checkout freetz development branch
svn co http://svn.freetz.org/trunk/ freetz-trunk
cd freetz-trunk/

### Get latest revision
revision=$(LC_ALL=C svn info | grep "Last Changed Rev" | awk {'print $4'})
echo $revision

### Turn freetz-trunk source-dir into a GIT repository
git add --ignore-errors ./ ; git commit -m "`basename $PWD` SVN revision $revision"

### Edit some files and save changes
$EDITOR file1 file2

### Extract patchset
git format-patch --no-prefix --no-numbered $FIRST..$LAST

### Some git format-patch options explained:
      --no-prefix: Do not show any source or destination prefix.
   -n, --numbered: Name output in [PATCH n/m] format, even with a single patch.
-N, --no-numbered: Name output in [PATCH] format.


- Sedat Dilek <sedat.dilek@gmail.com> (15-Jun-2011)