[Privoxy-devel] Git merges on master

[Fabian Keil]

Fabian Keil <fk at fabiankeil.de> wrote on 2020-12-14:

> Lee <ler762 at gmail.com> wrote on 2020-12-14:
 
> > but I've never noticed anything showing up on privoxy.org/gitweb/ before.
> >
> > Did I actually change anything & if so, how do I undo it?
> 
> It looks like you indeed pushed merge commits although I
> think this required additional steps ...
> 
> I think with the right git commands involving "git push --force"
> we could remove them again but this will inconvenience everyone who
> already pulled.
> 
> Reverting 867cd1d8 (if it should not be in master yet) will
> keep the somewhat ugly history but is probably sufficient.

Do you still get the warnings you silenced in 867cd1d8 with
the attached patch?

Fabian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Remove-pointless-redefinition-of-privoxy_mutex_t.patch
Type: text/x-patch
Size: 1605 bytes
Desc: not available
URL: <https://lists.privoxy.org/pipermail/privoxy-devel/attachments/20201220/a95634f6/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.privoxy.org/pipermail/privoxy-devel/attachments/20201220/a95634f6/attachment-0001.bin>