From: Segher Boessenkool <segher@kernel.crashing.org>
To: Alan Modra <amodra@gmail.com>
Cc: Jonathan Wakely <jwakely.gcc@gmail.com>,
Richard Biener <richard.guenther@gmail.com>,
Jeff Law <law@redhat.com>,
Richard Sandiford <richard.sandiford@arm.com>,
"H.J. Lu" <hjl.tools@gmail.com>,
Paul Smith <paul@mad-scientist.net>,
GCC Development <gcc@gcc.gnu.org>
Subject: Re: Git ChangeLog policy for GCC Testsuite inquiry
Date: Sat, 08 Feb 2020 19:58:00 -0000 [thread overview]
Message-ID: <20200208195830.GD22482@gate.crashing.org> (raw)
In-Reply-To: <20200207231653.GL5669@bubble.grove.modra.org>
On Sat, Feb 08, 2020 at 09:46:53AM +1030, Alan Modra wrote:
> On Fri, Feb 07, 2020 at 10:08:25AM +0000, Jonathan Wakely wrote:
> > With Git you can't really have unwanted local commits present in a
> > tree if you use a sensible workflow, so if you tested in a tree that
> > was at commit 1234abcd and you push from another machine that is at
> > the same commit, you know there are no unintended differences.
>
> Maybe I don't have a sensible workflow, but often with lots of tiddly
> little binutils patches I don't bother with branches for everything.
Yup, same here. And I sometimes "git revert" some of the patches I have
in my "work" tree to be able to test other patches, while making it easy
to get things back. To prevent "death by a thousand branches" syndrome.
Apparently you can do similar with "git stash", but I never got the hang
of that.
Sometimes I revert a revert of a revert. That's probably too much
though :-)
> Some of those patches tested might not be ready for commit upstream
> (lacking comments, changelogs, even lacking that vital self review),
> so I'll "git rebase -i" to put the ones that are ready first, then
> "git push origin <commit id>:master"
> just to push up to the relevant commit. That works quite well for me.
I only ever push from master (or some other local tracking branch), and
never commit to those tracking branches other than immediately before
pushing. This prevents mistakes.
Segher
next prev parent reply other threads:[~2020-02-08 19:58 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
2020-02-07 10:08 ` Jonathan Wakely
2020-02-07 23:17 ` Alan Modra
2020-02-08 19:58 ` Segher Boessenkool [this message]
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=20200208195830.GD22482@gate.crashing.org \
--to=segher@kernel.crashing.org \
--cc=amodra@gmail.com \
--cc=gcc@gcc.gnu.org \
--cc=hjl.tools@gmail.com \
--cc=jwakely.gcc@gmail.com \
--cc=law@redhat.com \
--cc=paul@mad-scientist.net \
--cc=richard.guenther@gmail.com \
--cc=richard.sandiford@arm.com \
/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).