bugfixes for ol-mmr

[Oliver Liebel]

Am 16.03.2010 13:08, schrieb Andrew Bartlett:
> On Sat, 2010-03-13 at 23:47 +0100, Oliver Liebel wrote:
>    
>> Am 11.03.2010 00:32, schrieb Andrew Bartlett:
>>      
>>> Please return the patches in 'git format-patch' format, and then I'll
>>> apply them.
>>>
>>> Thank you,
>>>
>>> Andrew Bartlett
>>>
>>>
>>>        
>> andrew,
>>
>> git format-patches are attached:
>>
>> - 0001-Added-Helpline-for-MMR.patch
>> slapd-startup-helpline (for mmr)
>>
>> - 0002-Fixed-MMR-URL-Split-and-RIDs.patch
>> (fixed mmr-url-split and changed rids to 3 digits (OpenLDAP ITS#6394))
>>
>> i hope i created the git format-patches correctly,  please let me know if
>> i missed something git-specific.
>>      
> These look good (the Author and commit message are good, which are the
> normal things folks get wrong), but something has munged the second
> patch.  I don't know what is quite wrong, but when I try and apply it, I
> get:
>
> $ git am --ignore-whitespace --whitespace=fix /tmp/oliver/000*
> Applying: Added Helpline for MMR
> Applying: Fixed MMR-URL-Split and changed RIDs to 3 Digits (OpenLDAP
> ITS#6394)
> /scratch/samba-1/.git/rebase-apply/patch:16: trailing whitespace.
>
> fatal: corrupt patch at line 29
> Patch failed at 0002 Fixed MMR-URL-Split and changed RIDs to 3 Digits
> (OpenLDAP ITS#6394)
>
> Andrew Bartlett
>
>    
hm, dont know.
i will check, generate a new one and re-submit it to you.

oliver