-
-
Notifications
You must be signed in to change notification settings - Fork 4.9k
csplit: clarify how the regex option works #19157
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
sbrl
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good to me! wording improvement is good, yesyes 🌟
e18e26d to
8fd47fe
Compare
|
Please don't force push |
Are we not supposed to rebase the branch when it gets outdated? What if there are conflicts? |
|
The github UI will warn in the case of conflicts. They are a non-issue. |
|
Right, that's a good point. It's a pity that we still have to rely on untidy commit histories to avoid breaking the code review experience, which should be the responsibility of the forge, i.e. GitHub. Hopefully novel approaches like GitButler's patch-based code review system and stable change IDs (like those used by jj) will catch on, so that we can have our cake and eat it too (i.e. have clean commit histories but also be able to follow the evolution of a patchset during review). For the time being, I'll refrain from force-pushing except to resolve conflicts. |
|
Every PR gets squshed before merge. An untidy commit history is a non-issue. |
| > More information: <https://www.gnu.org/software/coreutils/manual/html_node/csplit-invocation.html>. | ||
| - Split a file at lines 5 and 23: | ||
| - Split a file in two parts, starting the second one at line 10: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is still sort of ambiguous. Are you starting it before or after line 10.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure how I can make this clearer. If the second file starts at line 10, doesn't that necessarily mean that the split is before it, i.e. between lines 9 and 10?
Can you walk me through your thought process for an interpretation that would place the split after line 10, i.e. where line 10 would be part of the first split file? 🤔
In minor changes like this, I certainly agree. But I wouldn't hold that as a general rule, since more complex changes definitely benefit from modular commits, even if they result in a squashed commit in the main branch — people would then be able, at any point in the future, to follow the link in the commit to the PR and use the clean commit history to better understand the changes. Anyway, sorry for spawning an off-topic discussion here. As I mentioned above, I'll make sure to avoid unnecessary force-pushes in the future. |
Checklist
common,linux,osx,windows,sunos,android, etc.Reference issue: #