From: Richard Biener <richard.guenther@gmail.com>
To: Segher Boessenkool <segher@kernel.crashing.org>
Cc: Jeff Law <law@redhat.com>,
Richard Sandiford <richard.sandiford@arm.com>,
"H.J. Lu" <hjl.tools@gmail.com>,
paul@mad-scientist.net, GCC Development <gcc@gcc.gnu.org>
Subject: Re: Git ChangeLog policy for GCC Testsuite inquiry
Date: Fri, 07 Feb 2020 09:20:00 -0000 [thread overview]
Message-ID: <CAFiYyc0oKTuaBwLQwV=xUeZE5pjHVuve4sVN3iqULMLErGq-2A@mail.gmail.com> (raw)
In-Reply-To: <20200206222548.GH22482@gate.crashing.org>
On Thu, Feb 6, 2020 at 11:25 PM Segher Boessenkool
<segher@kernel.crashing.org> wrote:
>
> On Thu, Feb 06, 2020 at 03:01:20PM +0100, Richard Biener wrote:
> > On Thu, Feb 6, 2020 at 2:51 PM Segher Boessenkool
> > <segher@kernel.crashing.org> wrote:
> > > If you rebase changelog files, then yes, it's a bloody pain ;-)
> >
> > So do you have a script that takes a commit with a ChangeLog at its end
> > and populates the appropriate ChangeLog files?
>
> I develop my patches in Git, no changelog whatsoever. Then I "git
> format-patch" it. I write the changelog in that file (also proper white
> space, which "git commit" likes to destroy, I have a patch for that but
> not installed everywhere). "git send-email", wait for ack if necessary,
> "git am" and copy-and-paste the changelog parts, "git add" those
> changelog files, "git commit --amend", final sanity checks, and "git
> commit fsf master". I store the patch file to my archive, or I queue it
> for backport directly.
>
> > I'm trying to come up with
> > one to make the process less manual ...
>
> Yeah, don't look at me then :-)
>
> I *like* having most of those steps, most of this should only be done by
> people who are awake.
>
> > it's definitely a part that requires
> > more typing compared to svn.
>
> Instead of "git am" I had "patch -p1 <", distributing the changelog parts
> I just did in vi (as with git), then "svn ci", which pick up all modified
> files directly (sometimes an "svn add" first). It's pretty much the same
> for me.
I'm a believer on committing from the tree I actually tested, so it
was with SVN: patch, test, svn up, edit changelogs (cut&paste from the
patch header), svn diff | less (check wha'ts abotu to be committed), svn commit
with GIT its now: patch, test, git add/commit, git pull --rebase, edit
changelogs
(cut&paste from the patch header), git commit --amend, git push -n -v,
git show <what's pushed>, git push
So I wonder to "optimize" this somewhat.
> > ChangeLog file populating could be even
> > done on the server-side I guess (and not appropriately formatted logs
> > for the extraction/moving process rejected).
>
> Yup. As long as it's fool-proof, and we have some way to correct small
> disasters (both of those!)
I'd definitely prefer server-side operation, and yes, that "script" looking
at the commit would need to have a "extract changelog parts" part
for a pre-accept hook and the actual part amending the commit with
the changelog file changes (not sure if that's even possible in a hook?).
Fixing mistakes in the ChangeLog files could be as easy as allowing
changes to ChangeLog files without that magic.
Anyway, I hope to put sth together with bash & [g]awk
Richard.
>
> Segher
next prev parent reply other threads:[~2020-02-07 9:20 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAGWvnyktjKVp-T9jrGUt_rmzgaoS0Z5N1OPP9oaOvk0Xehrb_Q@mail.gmail.com>
[not found] ` <28d80650-26ec-04eb-65af-76151da4e411@redhat.com>
[not found] ` <CAGWvny=RM5cPi9VoJOKMoPNvgcybavT0CCcKSowxRNZwfrBqNw@mail.gmail.com>
[not found] ` <CADzB+2nLasW5mdFBWFd7xxXRLx8+UMnfXTwOYzU_x4c8=WcQRQ@mail.gmail.com>
2020-01-24 21:36 ` David Edelsohn
2020-01-24 21:45 ` Jeff Law
2020-01-24 22:38 ` Eric Botcazou
2020-01-24 22:39 ` Florian Weimer
2020-01-24 22:56 ` Jeff Law
2020-01-25 9:31 ` Jakub Jelinek
2020-01-25 10:53 ` Paul Smith
2020-01-25 14:07 ` H.J. Lu
2020-02-03 18:55 ` Richard Sandiford
2020-02-03 20:24 ` Jeff Law
2020-02-05 21:18 ` Segher Boessenkool
2020-02-06 8:51 ` Richard Sandiford
2020-02-06 13:37 ` Segher Boessenkool
2020-02-06 13:01 ` Jeff Law
2020-02-06 13:51 ` Segher Boessenkool
2020-02-06 14:01 ` Richard Biener
2020-02-06 14:40 ` Jonathan Wakely
2020-02-07 18:37 ` Tom Tromey
2020-02-07 21:41 ` Jason Merrill
2020-02-07 22:34 ` Tom Tromey
2020-02-08 16:50 ` Segher Boessenkool
2020-02-08 23:55 ` Andrew Pinski
2020-02-09 10:08 ` Segher Boessenkool
2020-02-10 17:51 ` Matthew Malcomson
2020-02-11 0:37 ` Segher Boessenkool
2020-02-06 22:25 ` Segher Boessenkool
2020-02-07 9:20 ` Richard Biener [this message]
2020-02-07 10:08 ` Jonathan Wakely
2020-02-07 23:17 ` Alan Modra
2020-02-08 19:58 ` Segher Boessenkool
2020-02-09 10:46 ` Jonathan Wakely
2020-02-09 17:49 ` Segher Boessenkool
2020-02-07 13:48 ` Segher Boessenkool
2020-02-07 13:56 ` Richard Earnshaw (lists)
2020-02-07 15:33 ` Segher Boessenkool
2020-02-07 15:43 ` Richard Earnshaw (lists)
2020-02-07 16:00 ` Segher Boessenkool
2020-02-10 13:09 ` Richard Biener
2020-02-10 17:27 ` Hans-Peter Nilsson
2020-02-06 14:56 ` Jakub Jelinek
2020-02-06 16:18 ` Segher Boessenkool
2020-02-06 16:25 ` Jakub Jelinek
2020-02-06 18:58 ` Jason Merrill
2020-02-06 23:10 ` Segher Boessenkool
2020-01-25 22:40 ` Nathan Sidwell
2020-01-26 14:59 ` Jeff Law
2020-02-03 10:15 ` Richard Earnshaw (lists)
2020-02-03 13:01 ` Nathan Sidwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFiYyc0oKTuaBwLQwV=xUeZE5pjHVuve4sVN3iqULMLErGq-2A@mail.gmail.com' \
--to=richard.guenther@gmail.com \
--cc=gcc@gcc.gnu.org \
--cc=hjl.tools@gmail.com \
--cc=law@redhat.com \
--cc=paul@mad-scientist.net \
--cc=richard.sandiford@arm.com \
--cc=segher@kernel.crashing.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).