Conversation

Notices

1. loveisgrief@mastodon.online's status on Thursday, 26-May-2022 06:10:14 UTC loveisgrief

   • raboof

   @raboof
   I don't even know why this is a discussion. When I want to resolve bugs, git blame with proper messages and small commits are so much better than huge commits, even if they are verbose.

   Sometimes there's an elaborate message to the squashed commit, when a small commit with an explanation of why THAT specific change was made is so much more helpful.

   "Fixed X" with no further message is of course very annoying and quite useless, but still better than a squashed commit.

   • raboof@merveilles.town's status on Thursday, 26-May-2022 06:10:13 UTC raboof

     in reply to

     @loveisgrief there is no debate that the intermediate commits can be helpful.

     They have disadvantages as well: for example, it is more likely the code is in a 'broken state' on the intermediate commits, and you could land on those during a 'git bisect' for a completely unrelated problem, interfering. Also 'Fixed X' might be a distraction when X was actually introduced on that same branch.

     Having '--first-parent' eliminates a disadvantage, making it more likely to be worth it.

     Santa Claes 🇸🇪🇭🇰🎅 likes this.
   • Santa Claes 🇸🇪🇭🇰🎅 (clacke@libranet.de)'s status on Thursday, 26-May-2022 07:19:05 UTC Santa Claes 🇸🇪🇭🇰🎅

     in reply to

     • raboof
     @raboof @loveisgrief Also not everyone can be convinced to invest in interactive rebasing and improvement of initially awful commits.
     
     Using the technical workaround of just squashing the whole PR may result in a more readable branch and burn less energy than trying to address the social root cause.