On Tue, Jul 17, 2018 at 12:52 PM Junio C Hamano <gits...@pobox.com> wrote:
> > (A) This sign off is inherent to the workflow. So we could > > change the workflow, i.e. you pull series instead of applying them. > > I think this "more in git, less in email" workflow would find supporters, > > such as DScho (cc'd). > > Sign-off is inherent to the project, in the sense that we want to > see how the change flowed recorded in the commits. > > With a pull-request based workflow, until Git is somehow improved so > that a "pull" becomes "fetch and rebase what got fetched on top of > my stuff, and add my sign-off while at it" (which is the opposite of > the usual "pull --rebase"), and here is where our thoughts did not align. I imagined a git-pull as of today (fetch + merge), where you in the role of the maintainer tells me in the role of an author to base my series on top of $X, such that there is no need for rebase on your end, (you would also not sign off each commit, but only the resulting merge) Even merge conflicts could be handed off to the authors instead of burdening you. > we would lose the ability to fully "use" > Git to run this project, as we would lose most sign-offs, unlike the > e-mail based workflow, which we can use Git fully to have it do its > job of recording necessary information. I think all needed information would still be there, but there would be an actual change as authors would be committers (as they commit locally and we keep it all in Git to get it to you and you keep it in Git to put it into the blessed repository) > And much more importantly, when "pull-request" based workflow is > improved enough so that your original without my sign-off (and you > shouldn't, unless you are relaying my changes) becomes what I > pulled, which does have my sign-off, range-diff that compares both > histories does need to deal with a pair of commits with only one > side having a sign-off. So switching the tool is not a proper > solution to work around the "sign-off noise" we observed. I do not view it as work around, but "another proper workflow that has advantages and disadvantages, one of the advantages is that it would enable us to work with this tool". > One side > having a sign-off while the other side does not is inherent to what > we actively want, [in the current workflow that has proven good for 10 years] > and you are letting your tail wag your dog by > suggesting to discard it, which is disappointing. I am suggesting to continue thinking about workflows in general, as there are many; all of them having advantages and disadvantages. I am not sure if workflows can be adapted easily via improving the current workflow continually or if sometimes a workflow has to be rethought to to changes in the landscape of available tools. When the Git project started, an email based workflow was chosen, precisely because Git was not available. Now that it has gained wide spread adoption (among its developers at least) the workflow could adapt to that. > > The other (2) downside is that everyone else (authors, reviewers) have > > to adapt as well. For authors this might be easy to adapt (push instead > > of sending email sounds like a win). > > As I most often edit the log message and material below three-dash > lines (long) _after_ format-patch produced files, I do not think it > is a win to force me to push and ask to pull Ah, that is an interesting workflow. Do you keep patch files/emails around locally, only to (long after) add a message and resend it? I try to keep any contribution of mine in Git as long as possible as that helps me tracking and fixing errors in my code and log messages. > > (B) The other point of view that I can offer is that we teach range-diff > > to ignore certain patterns. Maybe in combination with interpret-trailers > > this can be an easy configurable thing, or even a default to ignore > > all sign offs? > > That indicates the same direction as I alluded to in the message you > are responding to, I guess, which is a good thing. Yes, I imagined this is the approach we'll be taking. I think we would want to give %(trailers:none) or rather "ignore-sign-offs" to the inner diffs. Thanks, Stefan
