Thread (8 messages) 8 messages, 4 authors, 2023-10-27

Re: using oldest date when squashing commits

From: Oswald Buddenhagen <hidden>
Date: 2023-10-24 20:13:21

On Tue, Oct 24, 2023 at 10:30:01AM -0700, Junio C Hamano wrote:
Phillip Wood [off-list ref] writes:
quoted
quoted
quoted
Unfortunately "fixup -C" only copies the commit message not the
authorship
quoted
(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.
quoted
"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 [off-list ref]") 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help