From: Junio C Hamano <gitster@pobox.com>
To: "Kristoffer Haugsbakk" <code@khaugsbakk.name>
Cc: "Oswald Buddenhagen" <oswald.buddenhagen@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH] sequencer: beautify subject of reverts of reverts
Date: Mon, 27 Mar 2023 15:25:52 -0700 [thread overview]
Message-ID: <xmqqa5zxn85r.fsf@gitster.g> (raw)
In-Reply-To: 210376fb-f830-4883-b576-2936dabc09cc@app.fastmail.com
"Kristoffer Haugsbakk" <code@khaugsbakk.name> writes:
> On Thu, Mar 23, 2023, at 17:22, Oswald Buddenhagen wrote:
>> Instead of generating a silly-looking `Revert "Revert "foo""`, make it
>> `Reapply "foo"`.
>
> Nice addition.
>
> $ echo change >> README.md
> $ ./bin-wrappers/git add README.md
> $ ./bin-wrappers/git commit -m 'A change'
> $ ./bin-wrappers/git revert --no-edit @
> $ ./bin-wrappers/git revert --no-edit @
> $ ./bin-wrappers/git log --oneline master..
> adfce56c6a (HEAD -> reapply) Reapply "A change"
> 395894c2ce Revert "A change"
> a01e3d6b3d A change
> 058643b69f sequencer: beautify subject of reverts of reverts
I think Oswald saw the end of a thread a few years ago that
discussed a similar idea and the patch is a continuation of that
thread, but what should happen when the re-application turns out to
be bad?
The significance of the act of reverting such a reapplication to the
project would be different from the initial revert (where "yikes,
the change introduces a regression---let's revert to the state
before the change, regroup, and see what we should do" was the
motivation). Somebody thought that it now was OK to reintroduce the
change, presumably because the code paths around it now have become
ready for it and the phrase "Reapply" makes a perfect sense to
describe it ("Revert an earlier revert" is not too bad, either,
though). But then it turns out it still was a bad idea. Should we
say
Revert Reapply "A change"
Next time somebody thinks the code paths around there are finally
ready, do they do
Reapply Reapply "A change"
or something else? That may be shorter, but even more cryptic than
'Revert Revert Revert Revert "A change"'---"Revert^4 "A change"" the
other thread proposed start to look less horrible. So, I dunno.
next prev parent reply other threads:[~2023-03-27 22:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 16:22 [PATCH] sequencer: beautify subject of reverts of reverts Oswald Buddenhagen
2023-03-25 10:39 ` Kristoffer Haugsbakk
2023-03-27 22:25 ` Junio C Hamano [this message]
2023-03-28 6:04 ` Kristoffer Haugsbakk
2023-03-28 13:23 ` Oswald Buddenhagen
2023-03-28 13:43 ` Kristoffer Haugsbakk
2023-03-28 14:00 ` Junio C Hamano
2023-03-28 14:02 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa5zxn85r.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=oswald.buddenhagen@gmx.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).