[Pkg-sssd-devel] uid-wrapper git merge vs ftp import

[Simon Josefsson]

I have force-pushed uid-wrappers' 'upstream' branch so it looks good.

I have pushed what I suggest to force-push to master as a new branch
called 'new-master'.  It is a cleaned up version of my work, the end
result is identical to what was uploaded to unstable.

If you are happy with proceeding, please on Salsa go to
Settings->Repository->Protected branches and allow force-push for
master.  I can force-push new-master as master, or you can do it if you
prefer.  Then disallow force-pushing for the future when we are done.

Sorry about this!

/Simon

Simon Josefsson <simon at josefsson.org> writes:

> Hi.  When starting to look at nss-wrapper, I realized I imported the
> tarball for uid-wrapper instead of merging upstream git repository...
> which is not the way you wanted to work, sorry :-/   Old habits die
> slowly.  Do you want me to fix the salsa git repository with a force
> push to revert my tarball import and use an upstream git ff-only merge
> instead?  I will have to redo a bunch of commits, but afterwards the
> git history will look prettier and the upload I just did will be
> identical.
>
> /Simon
>
> _______________________________________________
> Pkg-sssd-devel mailing list
> Pkg-sssd-devel at alioth-lists.debian.net
> https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-sssd-devel
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 255 bytes
Desc: not available
URL: <http://alioth-lists.debian.net/pipermail/pkg-sssd-devel/attachments/20230805/9af27c9f/attachment.sig>