Follow @Openwall on Twitter for new release announcements and other news
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Tue, 07 May 2013 19:55:46 +0400
From: Alexander Cherepanov <cherepan@...me.ru>
To: john-dev@...ts.openwall.com
Subject: Re: Some typos

On 2013-05-04 14:58, magnum wrote:
>>>> run/dynamic.conf seems to be missed while patching. Attaching remaining patch.
>>>
>>> I blame git for weird behaviour. Fixed.
>>
>> I get such an effect when I do 'patch -p2' in src/ dir.
>
> Yes but that emits this, which is hard to miss:
>
> can't find file to patch at input line 7
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |Fix some typos.
> |
> |diff --git a/run/dynamic.conf b/run/dynamic.conf
> |index 7ee8f5c..1e8dfe3 100644
> |--- a/run/dynamic.conf
> |+++ b/run/dynamic.conf
> --------------------------
> File to patch:

My patch is not nearly verbose but it also print something.

> Doing "git apply" of same patch in src/ dir does not even warn. It silently skips dynamic.conf. I really think it should warn.

Maybe it's better for you to use "git am"? Save an emails with a 
interesting patches, edit them to remove unnecessary text and run "git 
am" on them. This will make a commit with an author taken from "From: " 
field etc.

You can also try "git am" on my patches (patches, not emails) about 
non-ascii chars that I posted earlier today. They are prepared with "git 
format-patch".

-- 
Alexander Cherepanov

Powered by blists - more mailing lists

Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.