Re: Patch-level-format conversion

From: Sedat Dilek <sedat.dilek@googlemail.com>
Date: Jun 15, 2011, 22:28 UTC
Message-ID: <BANLkTi=w1SP6zEZGs1WQ_2L0bWQ2cneNSQ@mail.gmail.com>
In-Reply-To: <7v39jakajn.fsf@alter.siamese.dyndns.org>

Hi Junio,

On Thu, Jun 16, 2011 at 12:13 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 27 quoted lines

> Sedat Dilek <sedat.dilek@googlemail.com> writes:
>
>> 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"
>
> Wouldn't "add ./" add all the cruft in .svn (and its huge "pristine"
> subdirectory)?  Why --ignore-errors?
>

I used to use it after reading the blog-post in [1].

Show 10 quoted lines

>> ### Edit some files and save changes
>> $EDITOR file1 file2
>>
>> ### Extract patchset
>> git format-patch --no-prefix --no-numbered $FIRST..$LAST
>
> You would need to record your own changes made by the $EDITOR step in
> commits before asking format-patch to make patch files out of them, but I
> do not see that step.
>

Ooops, yeah missed the git commit command(s) :-(. Thanks for the pointer!

> Also it is unclear how you determine $FIRST and $LAST.  FIRST must name
> the commit that is the _parent_ of your first commit (i.e. your sample
> command line tells $FIRST to be excluded).
>

It's just an example... IIRC I really did "git format-patch --no-prefix -19" (extract last 19 commits). Hmmm, remember I got no "origine" for initial commit...

Show 8 quoted lines

>> ### 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)
>

- Sedat -

[1] http://who-t.blogspot.com/2009/06/git-patches-from-tarballs.html