ls.c: versort incompatible w/ timesort and sizesort

[concussious]

Based on this comment #818 (comment)

[igalic]

that's all i have for now, i just woke up and I'm nowhere close to a computer

i can help with git if you need that help, or maybe other people in #freebsd-dev on https://libera.chat/ can too, if GitHub comments aren't the most appropriate way to do that

[markjdb]

Your commits delete ls.1 and then re-add it, so the diffs are not readable. Please clean up the git history and force-push.

[igalic]

@concussious this looks very good now.
thank you very much.

Please fix your email address in the commit Metadata, as we don't accept noreply (Github) addresses

[concussious]

Please fix your email address in the commit Metadata, as we don't accept noreply (Github) addresses

Did that work? Sorry, this is my first times learning to do this.

[bsdimp]

You got the name right. Looking at the latest version I see:

commit b9835b6845a6e199d56b78403af52a8c028c35e8 (github-freebsd/pull/825/head)
Merge: 8c2909867afd dafd0d685531
Author: Alexander Ziaee <[email protected]>
Date:   Fri Jan 12 11:24:49 2024 -0500

    Merge branch 'freebsd:main' into ls(1)

commit 8c2909867afd2c56c99040744521db635780d90c
Author: Alexander Ziaee <[email protected]>
Date:   Fri Jan 12 11:24:44 2024 -0500

    ls.1: versort incompatible w/ timesort and sizesort

commit 653855fe57c8b91c6540596c3c45ad7d0c462932
Author: Alexander Ziaee <[email protected]>
Date:   Fri Jan 12 11:24:30 2024 -0500

    ls.c: versort incompatible w/ timesort and sizesort

however, there's three small problems remaining. First, you used 'git merge' to merge the latest FreeBSD into your branch. We want our pull requests to use a 'rebase' workflow without merge commits. This is easy for you to fix. You can do a git rebase -i main ls(1) (I think that's the name of the branch in your fork). This will throw away the merge commit and rebase things forward. While you are doing that (since I specified -i) you can change your 'work' file that comes up from 'pick' for those two revisions to pick followed by squash. This will squash these two changes together. You'll need to adjust the commit mesage. ls: versort is incompatible with timesort and sizesort.

Finally, since you made a semantic change to the man page (as opposed to fixing a typo or fixing a small grammar error), you should bump the .Dd date line to today's date.

You'll need to do a git push --force-with-lease to update since you're rewriting history. Since you're editing the history so it looks best in the FreeBSD repo, these steps produce the best outcome.

Thanks for your submission @concussious and your attention to these details.

[concussious]

Thank you so much sir. I promise this lesson will pay off in the future.

[igalic]

👍

[bsdimp]

Thanks for the force push. This seems like a completely sane change. to me.

[bsdimp]

d854370
I also noticed I missed igalic's review here. mea culpa... I don't know how to automate snagging this when I download the PR.

[igalic]

I don't know how to automate snagging this when I download the PR.

yeah, i don't see anything useful here https://api.github.com/repos/freebsd/freebsd-src/pulls/825

Maybe gh has something more useful?