From: roam@ringlet.net
On Sun, Aug 17, 2025 at 10:22:57PM +0100, Richard Lewis wrote:
> Peter Pentchev writes:
>
> > On Sun, Aug 17, 2025 at 09:34:14PM +0100, Richard Lewis wrote:
> >> "Theodore Ts'o" writes:
> >>
> >> > In some cases, if it's a patch sent via e-mail, I'll just fix up the
> >> > patch and then let the contributor know that they failed to do error
> >> > checking, or their patch had a buffer overrun and result in a security
> >> > vulnerability etc. But with a merge request, all I can do is explain
> >> > what they did wrong, and ask them to resubmit the merge request.
> >>
> >> Not looking to argue the main point (90% of everything is crud, and i
> >> dont think anyone things every contribution must be accepted), but this
> >> statement confused me: the merge request is already in git, so i dont
> >> understand why people think it is harder to use than a patch attached to
> >> an email? you can check out a merge request and amend or cherry pick
> >> commits. you could even run git diff and pipe the result into a patch
> >> and use whatever existing workflow works for the bts?
> >
> > ...but how do you then tell the Git forge to use your changes when
> > you want to tell it to merge this merge request?
>
> i think you would just use git merge and git push etc from a command
> line like any other branch. (i assume deleting the merge-request branch
> from the command-line would close the MR, but maybe you need to use some
> salsa api instead)
But that would mean that you do not really mark the merge request as,
well, merged. This might be okay with some contributors; with others it
might leave a bit of a sour taste. As with so many other things, it depends.
G'luck,
Peter
--
Peter Pentchev roam@ringlet.net roam@debian.org peter@morpheusly.com
PGP key: https://www.ringlet.net/roam/roam.key.asc
Key fingerprint 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEELuenpRf8EkzxFcNUZR7vsCUn3xMFAmiiTJ0ACgkQZR7vsCUn
3xNNcg//SmEaWe7jcj3b+4O+qxegVk0yLfo2KW094V2MUBiQwfNbA/qFPLoI8EGF
vwvBET6iDSscbpxxYOL4KIRlvjKy0EHIGm4wQMFHdTfpqUbilWV/3FbPfD0SzL97
GageQ5CFitgbgwLf8B8bAR3fDAsnY04HDFJ8PZ0q+iGCTgH49t6OobnoZ7guSKxf
mD44x+J+JsTl1/8kMT/jBDHkZmwuF+43NXN7kKbOztlhtMMuqxDAyMAwBTkJBOs5
e37/6yUTSR3Emd3d88i6s8tB9HoG+vmkt3zrnaviif20+gsustQO4BspTqfbh1oq
1ddZL+qc3qMKdF+Fpq6z3lkA8XHlaFTTdAdBXf1K7IWwbGy7QEo/SgK0aBLRvpec
vubqZdSS/s7FshiTvstfy5Gc6saygyUuVgEXKQCFP1Ce00P3CQs0IjLdSXXDwi6f
Kl0wUw3ng31H2hWatUiFuodR51WFfEJPCmmmeXIMCzwR1fhNvr/pO8lQ8/v3ZKrP
OPpwusmB7Y490DJode+sX7cOWqU8kmy07Ssthst2ZS3Tz4cg3clMm6sX9Gek4evX
My6KeC7jNsBes55l9yxbeoJiOIAwXPI49N4lWwVzMtYP2noJtnVsKF255jPN5iAb
94/hJqApCYz2SKDkWkYlFiJD2jIMmowWYjD3m3OQD3BrheRXuxE=
=Bqvy
-----END PGP SIGNATURE-----
--- SoupGate-Win32 v1.05
* Origin: you cannot sedate... all the things you hate (1:229/2)
|