git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sedat Dilek <sedat.dilek@googlemail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Patch-level-format conversion
Date: Wed, 15 Jun 2011 23:16:54 +0200	[thread overview]
Message-ID: <BANLkTim8bdVGo8u_HzZpE_5+xmPe_O+_Dw@mail.gmail.com> (raw)
In-Reply-To: <20110615205507.GB27172@elie>

[-- Attachment #1: Type: text/plain, Size: 1718 bytes --]

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 -

[-- Attachment #2: README.txt --]
[-- Type: text/plain, Size: 891 bytes --]

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)

  reply	other threads:[~2011-06-15 21:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <BANLkTimRArtFBqA4BFASjkS9BC1sbSfUJQ@mail.gmail.com>
2011-06-15 20:55 ` Patch-level-format conversion Jonathan Nieder
2011-06-15 21:16   ` Sedat Dilek [this message]
2011-06-15 22:13     ` Junio C Hamano
2011-06-15 22:28       ` Sedat Dilek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=BANLkTim8bdVGo8u_HzZpE_5+xmPe_O+_Dw@mail.gmail.com \
    --to=sedat.dilek@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=sedat.dilek@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).