Timeline for Is there anything wrong in reordering commits?
Current License: CC BY-SA 4.0
7 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Oct 27, 2024 at 7:41 | comment | added | cmaster - reinstate monica | @Alexander Which won't tell you which commit is actually to blame. Again, the smaller the change set that you can identify with git bisect, the happier you will be. | |
| Oct 26, 2024 at 21:17 | comment | added | Alexander | It's lesser known, but that's where git bisect --first-parent comes in. It'll run only over the merge commits, which bisects at the PR level, rather than their constituent commits | |
| Oct 26, 2024 at 20:55 | comment | added | cmaster - reinstate monica | @Alexander Yeah, such commits can be a valid reason for a non-building commit. However, the result of every commit with actual changes should build with the test suite completing as expected. That's the only way that people can actually put git bisect to good use. The larger the gaps in buildability, the more involved the hunt for the actual cause of a recession. | |
| Oct 26, 2024 at 20:46 | comment | added | Alexander | Well in GitHub's approach to git, commits shouldn't necessarily be green. The atomic unit of green changes is a pull request (and the corresponding merge commit it creates), not the individual commits themselves. It's perfectly reasonable to have an intermediate commit that isn't green, and even necessary in some cases. E.g. for big file moves+changes, the only way to preserve file history is to do the moves in a separate commit from the changes. They can't be squashed, otherwise the "file moved" heuristic fails, and they're seen as file deletions + new file creations | |
| Oct 26, 2024 at 20:11 | comment | added | cmaster - reinstate monica | @Alexander That's a good implementation of #3, definitely. At least as long as it's configured to actually test every submitted commit, not just the endpoint of a committed branch. I don't know whether every CI solution does this, though. It seems like a corner that's likely to be cut. | |
| Oct 26, 2024 at 18:00 | comment | added | Alexander | #3 is a moot point if you're running CI on every pull request, which you definitely should be. | |
| Oct 26, 2024 at 17:04 | history | answered | cmaster - reinstate monica | CC BY-SA 4.0 |