From: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Phillip Wood <phillip.wood123@gmail.com>,
phillip.wood@dunelm.org.uk, Johannes Sixt <j6t@kdbg.org>,
git@vger.kernel.org
Subject: Re: using oldest date when squashing commits
Date: Tue, 24 Oct 2023 22:13:15 +0200 [thread overview]
Message-ID: <ZTglW0fQnSTV+TnD@ugly> (raw)
In-Reply-To: <xmqqpm143p46.fsf@gitster.g>
On Tue, Oct 24, 2023 at 10:30:01AM -0700, Junio C Hamano wrote:
>Phillip Wood <phillip.wood123@gmail.com> writes:
>>>> Unfortunately "fixup -C" only copies the commit message not the
>>>> authorship
>>>
>>>> (that's usually a good thing
>>>>
>>> why? what would that be useful for?
>>> it seems rather counter-intuitive.
>>
>> In the same way that you do not want to change the author date when
>> using a fixup to move a small hunk from one commit to another most
>> users do not want to update the author information when they make a
>> small change to a commit message using "fixup -C"
>
>Exactly. [...]
>I wouldn't be able to use "rebase -i" to
>make typofixes to commits made out of received patches if the
>operation changes the authorship.
>
>> "fixup -c/-C" were conceived as a way to reword a commit message at
>> the same time as optionally fixing up the commit's content.
>
>Yup, it still is a "fix", meaning the identity and the spirit of the
>commit being fixed are unchanged. What it aims to achieve, how it
>implements the behaviour it wants to give its users, who thought of
>that change, all that are the same as the original.
>
ok, i think i finally got it. it would have never ocurred to me to make
a command for that - i just use "squash" and throw away the extra lines.
but i guess it sort of makes sense if you use rebase as a
non-interactive execution backend for instructions that are fully
determined long in advance by heaping commits at the end.
> It may be a nice addition to optionally allow users to use
> --reset-author (or better yet, --author="Na Me <a@dd.re.ss>") with
> "fixup"
>
that's kind of the opposite of what i'd want - the "pre-fixup" commit
already has the equivalent of that by virtue of being fresh. so it would
be more like --copy-author. but i'd go with adding -ca/-CA variants
instead, for brevity.
>but if the "-c" variant can be concluded with "commit --amend
>--reset-author" to achieve the same effect, that may be sufficient.
>
from the above follows that the equivalent of my original request would
be appending "exec git commit --amend -C <orig>" to the "pick
<pre-fixup>" + "fixup <orig>" commands. which is of course horrible, and
i'd never remember to actually do that. it will be hard enough to
retrain myself to use -CA instead of -C.
regards
next prev parent reply other threads:[~2023-10-24 20:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-19 12:48 using oldest date when squashing commits Oswald Buddenhagen
2022-03-20 8:05 ` Johannes Sixt
2022-03-20 10:53 ` Oswald Buddenhagen
2023-10-24 9:26 ` Phillip Wood
2023-10-24 10:18 ` Oswald Buddenhagen
2023-10-24 14:00 ` Phillip Wood
2023-10-24 17:30 ` Junio C Hamano
2023-10-24 20:13 ` Oswald Buddenhagen [this message]
2023-10-24 21:19 ` Johannes Sixt
2023-10-27 12:34 ` Marc Branchaud
2023-10-27 12:45 ` Oswald Buddenhagen
2023-10-27 13:20 ` Marc Branchaud
2023-10-27 13:26 ` Oswald Buddenhagen
2023-10-27 13:46 ` Marc Branchaud
2023-10-27 23:24 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZTglW0fQnSTV+TnD@ugly \
--to=oswald.buddenhagen@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).