Re: [PATCH 78/83] Move libified code from builtin/apply.c to apply.{c,h}

From: Christian Couder <christian.couder@gmail.com>
Date: May 6, 2016, 20:18 UTC
Message-ID: <CAP8UFD0ktQyk3SHFbq=fjK8++UArNmy+3p3CCgHaDBT5WRwU6Q@mail.gmail.com>
In-Reply-To: <CAP8UFD0Ku_q56JMvyh9UncJ2D+QsOcB4Svyr5ZWj+KqAaHORMw@mail.gmail.com>

On Thu, May 5, 2016 at 10:50 AM, Christian Couder <christian.couder@gmail.com> wrote:

Show 28 quoted lines

> On Wed, May 4, 2016 at 1:32 PM, Duy Nguyen <pclouds@gmail.com> wrote:
>> On Wed, May 4, 2016 at 5:39 PM, Christian Couder
>> <christian.couder@gmail.com> wrote:
>>>
>>> Right now I get:
>>>
>>>> git log --summary -M -C -B -1 20f1d27
>>> commit 20f1d274609f5dde2eaaa279e7ee79fd5ef9c849
>>> Author: Christian Couder <chriscool@tuxfamily.org>
>>> Date:   Fri Apr 22 20:55:46 2016 +0200
>>>
>>>     Move libified code from builtin/apply.c to apply.{c,h}
>>>
>>>     Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
>>>
>>>  copy builtin/apply.c => apply.c (96%)
>>>  rewrite builtin/apply.c (96%)
>>
>> Ah.. I forgot about -B to break rename pairs! This looks good. I
>> really need to go back to diff rename hints series, so we can annotate
>> this commit and don't have to use -B every time.
>>
>>> And using format-patch:
>>>
>>>> git format-patch -M -C -B -1  -o ../../patches/test-libify-apply-use-in-am/ 20f1d27
>>> ../../patches/test-libify-apply-use-in-am/0001-Move-libified-code-from-builtin-apply.c-to-apply.-c-.patch
>>>> wc ../../patches/test-libify-apply-use-in-am/0001-Move-libified-code-from-builtin-apply.c-to-apply.-c-.patch
>>>   5264  23426 147133

By the way does someone know how such a patch can be applied?

I get the following:

> git reset --keep 20f1d27~
> git am ../../patches/test-libify-apply-use-in-am/0001-Move-libified-code-from-builtin-apply.c-to-apply.-c-.patch

Applying: Move libified code from builtin/apply.c to apply.{c,h}
error: apply.c: already exists in index
Patch failed at 0001 Move libified code from builtin/apply.c to apply.{c,h}
The copy of the patch that failed is found in:
   /home/christian/git/git/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

With git apply I get:

> git am --abort
> git apply -v ../../patches/test-libify-apply-use-in-am/0001-Move-libified-code-from-builtin-apply.c-to-apply.-c-.patch

Checking patch builtin/apply.c => apply.c... error: apply.c: already exists in working directory Checking patch apply.h... Checking patch builtin/apply.c...