[SSSD] [PATCH] sss_override: Remove unused parameter tool_ctx

Pavel Reichl preichl at redhat.com
Wed Oct 21 11:30:02 UTC 2015



On 10/21/2015 01:17 PM, Lukas Slebodnik wrote:
> On (21/10/15 11:45), Pavel Březina wrote:
>> On 10/21/2015 11:24 AM, Pavel Reichl wrote:
>>> Hello,
>>>
>>> please see simple patch attached.
>>>
>>> Thanks.
>>>
>>>
>>> _______________________________________________
>>> sssd-devel mailing list
>>> sssd-devel at lists.fedorahosted.org
>>> https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
>>>
>>
>> ACk.
> I cannot apply patch to master.
> [user at host]$git log -1 --oneline
> 96544fc CI: Handle dashes in valgrind-condense
> [user at host]$git am -3 ~/mstore/0001-sss_override-Remove-unused-parameter-tool_ctx.patch
> Applying: sss_override: Remove unused parameter tool_ctx
> error: invalid object 100644 da3d9bbc6f62ae529887156c4084511a47ea0c26 for 'src/tools/sss_override.c'
> fatal: git-write-tree: error building trees
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 sss_override: Remove unused parameter tool_ctx
> The copy of the patch that failed is found in:
>     /dev/shm/sssd/.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".
>
> LS
Sorry I applied it on top of recent Pavel's patches.

Patch that applies clearly on master is attached.

> _______________________________________________
> sssd-devel mailing list
> sssd-devel at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-sss_override-Remove-unused-parameter-tool_ctx.patch
Type: text/x-patch
Size: 2566 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/sssd-devel/attachments/20151021/f7bfc006/attachment.bin>


More information about the sssd-devel mailing list