Follow @Openwall on Twitter for new release announcements and other news
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <f21cfb5203cca677b92edadbd91a5ba9@smtp.hushmail.com>
Date: Mon, 09 Jul 2012 12:16:41 +0200
From: magnum <john.magnum@...hmail.com>
To: john-dev@...ts.openwall.com
Subject: Re: Pull requests

On 2012-07-09 12:08, magnum wrote:
> On 2012-07-09 11:51, Sayantan Datta wrote:
>> On Mon, Jul 9, 2012 at 8:59 AM, Solar Designer <solar@...nwall.com> wrote:
>>
>>> On Mon, Jul 09, 2012 at 11:06:41AM +0800, myrice wrote:
>>>> I have sent a pull request(xsha512-cuda bug fix) to magnum-jumbo. I
>>>> think I should resend it to Jumbo-7, right?
>>>
>>> I'm not magnum, but bugfixes should definitely be getting into the
>>> -fixes branch as well.
>>>
>>> Alexander
>>>
>>
>> I'm a liitle confused with the whole process. First I push to my remote
>> branch using command:
>> git push https://github.com/Sayantan2048/magnum-jumbo.gitmagnum-jumbo:1.7.9-jumbo-6-fixes
> 
> That URL is wrong.
> 
>> Then I sent a pull request to
>> magnumripper/magnum-jumbo@....9-jumbo-6-fixes.However it says my
>> 1.7.9-jumbo-6-fixes branch is ahead by 38 commits.
>> However it should be only 1.
> 
> From what I can see you haven't got the 1.7.9-jumbo-6-fixes branch in
> your repo.

Now I see it. But it looks like you've done something wrong. You have
magnum-jumbo stuff in your -fixes branch.

magnum

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.