fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sort: Don't do fallback top-level sort in check mode

Browse Source 
The fallback useful to provide a consistent order of tied lines, but
in check mode, we don't want it to report disorder for equal lines
(according to the passed flags).

Thanks to Richard Ipsum for the bug report and proposed patch.
This commit is contained in:
Michael Forney 2020-01-03 15:32:07 -08:00
parent e9bfb97808
commit e5284b1537
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sort.c
View File

@ -385,6 +385,7 @@ main(int argc, char *argv[])
/* -b shall only apply to custom key definitions */ /* -b shall only apply to custom key definitions */
if (TAILQ_EMPTY(&kdhead) && global_flags) if (TAILQ_EMPTY(&kdhead) && global_flags)
addkeydef("1", global_flags & ~(MOD_STARTB | MOD_ENDB)); addkeydef("1", global_flags & ~(MOD_STARTB | MOD_ENDB));
if (TAILQ_EMPTY(&kdhead) || (!Cflag && !cflag))
addkeydef("1", global_flags & MOD_R); addkeydef("1", global_flags & MOD_R);
if (!argc) { if (!argc) {