From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: Marc Branchaud <marcnarc@xiplink.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Taylor Blau <me@ttaylorr.com>,
Christian Couder <christian.couder@gmail.com>,
Charvi Mendiratta <charvi077@gmail.com>
Subject: Re: [PATCH v3] git-rebase.txt: rewrite docu for fixup/squash (again)
Date: Fri, 27 Oct 2023 18:12:17 +0200 [thread overview]
Message-ID: <ZTvhYSMOiaNbpTZ2@ugly> (raw)
In-Reply-To: <56e3e974-a027-439f-871d-c7fbae65a04e@xiplink.com>
On Fri, Oct 27, 2023 at 09:14:42AM -0400, Marc Branchaud wrote:
>On 2023-10-25 06:29, Oswald Buddenhagen wrote:
>> The behavior in the presence of multiple "fixup -c" is somewhat
>> questionable, as arguably it would be better to complain about it rather
>> than letting the last instance win. But for the time being we document
>> the status quo, with a note that it is not guaranteed. Note that
>> actually changing it would require --autosquash eliding the superseded
>> uses.
>
>I do not think this kind of editorializing belongs in the commit's
>message, but this likely isn't the first commit message that expresses
>an opinion.
>
commmit messages should elaborate alternatives considered, which
includes ones which depend on changes that can be reasonably expected to
possibly happen at some point.
>But I think you should remove the "but this should not be relied upon"
>phrase. This reads as if Git's current behaviour is undefined, which
>most definitely is not true.
>
>Even changing this to something like "but this might change in the
>future" is unhelpful. Everything in Git is subject to change over a
>long-enough time span, so the same could be said about every aspect of Git.
>
>Until the behaviour actually changes, it's perfectly fine for people to
>use multiple "fixup -c" commands. There's no reason to scare them off
>of it.
>
things can't change overnight; the resistance even the most trivial
behavior changes meet is enormous. so explicitly documenting long in
advance that something is subject to change is basically the only way to
get it changed at all.
specifically for this feature, there is no reason at all to rely on this
behavior when hand-editing the todo list, and occurrences most likely
indicate a mistake, which is why i would prefer it to be rejected.
regards
next prev parent reply other threads:[~2023-10-27 16:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 13:00 [RESEND v2] git-rebase.txt: rewrite docu for fixup/squash (again) Oswald Buddenhagen
2023-10-23 16:01 ` Phillip Wood
2023-10-23 17:52 ` Oswald Buddenhagen
2023-10-24 9:22 ` Phillip Wood
2023-10-24 17:19 ` Junio C Hamano
2023-10-23 16:59 ` Taylor Blau
2023-10-24 21:31 ` Oswald Buddenhagen
2023-10-24 14:01 ` Marc Branchaud
2023-10-24 21:19 ` Oswald Buddenhagen
2023-10-27 12:39 ` Marc Branchaud
2023-10-27 13:08 ` Oswald Buddenhagen
2023-10-25 10:29 ` [PATCH v3] " Oswald Buddenhagen
2023-10-27 13:14 ` Marc Branchaud
2023-10-27 16:12 ` Oswald Buddenhagen [this message]
2023-10-27 23:34 ` Junio C Hamano
2023-10-31 18:48 ` Marc Branchaud
2023-10-30 9:55 ` Phillip Wood
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=ZTvhYSMOiaNbpTZ2@ugly \
--to=oswald.buddenhagen@gmx.de \
--cc=charvi077@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marcnarc@xiplink.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood123@gmail.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 NNTP newsgroup(s).